рефакторинг. неудачные наименования классов, и остатки старых вариантов

This commit is contained in:
2023-10-08 01:06:55 +03:00
parent 49805f1293
commit eedddcd7d3
42 changed files with 295 additions and 1415 deletions

View File

@@ -7,7 +7,6 @@ import Common.UI.TextField.StyledTextField;
import Common.UI.UI;
import GlobalData.Compiler.CompilerType;
import GlobalData.Credentials.Credentials;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.Group;
import TestingSystem.MachineMaxKernels.MachineMaxKernels;
@@ -121,7 +120,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.db.machines.mountUI(machinesPanel);
Global.db.users.mountUI(usersPanel);
Global.db.compilers.mountUI(compilersPanel);
Global.db.remoteSapfors.mountUI(sapforsPanel);
Global.db.makefiles.mountUI(makefilesPanel);
//-----------------------------------------------
Global.db.modules.mountUI(modulesPanel);
@@ -153,8 +151,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
Global.testingServer.db.sapforScenarios.mountUI(sapforScenariosPanel);
Global.testingServer.db.sapforTasksPackages.mountUI(sapforPackagesPanel);
Global.testingServer.db.sapforTasksPackages.mountUI(sapforScenariosPanel);
// Global.testingServer.db.sapforTasksPackages.mountUI(sapforPackagesPanel);
//Global.db.sapforTasks.mountUI(sapforTasksPanel);
// Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforPackagesPanel);
@@ -191,7 +189,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.account_db.packages.ShowUI();
Global.testingServer.db.serverSapfors.ShowUI();
Global.testingServer.db.sapforConfigurations.ShowUI();
Global.testingServer.db.sapforScenarios.ShowUI();
Global.testingServer.db.sapforTasksPackages.ShowUI();
}
//-
@Override
@@ -388,12 +386,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
credentials.runconfiguration_id = Constants.Nan;
Global.db.UpdateCredentials();
}
/*
if (Global.db.remoteSapfors.containsKey(credentials.remotesapfor_id)) {
Global.db.remoteSapfors.ShowUI(credentials.remotesapfor_id);
} else {
credentials.remotesapfor_id = Constants.Nan;
Global.db.UpdateCredentials();
}
*/
} else {
credentials.machine_id = Constants.Nan;
credentials.user_id = Constants.Nan;
@@ -429,15 +429,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
}
@Override
public void ShowCurrentSapforTasksPackage() {
/*
UI.Clear(packageVersionsPanel);
if (Current.getSapforTasksPackage().root != null) {
PackageVersionsTree tree = new PackageVersionsTree();
packageVersionsPanel.add(new JScrollPane(tree));
packageVersionsPanel.revalidate();
packageVersionsPanel.repaint();
}
*/
}
@Override
public void ShowNoSapforTasksPackage() {
@@ -476,11 +467,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
singleRunTaskMaster.ApplyObject();
}
@Override
public void RemoveSapforPackageFromComparison(SapforTasksPackage package_2023) {
sapforTestingMaster.CheckObject(package_2023);
sapforTestingSlave.CheckObject(package_2023);
}
@Override
public void DropSapforTasksComparison() {
sapforTestingMaster.RemoveObject();
sapforTestingSlave.RemoveObject();