From 52075bc64c31565f50994d97d250cf2db5e3fac3 Mon Sep 17 00:00:00 2001 From: 02090095 Date: Wed, 11 Oct 2023 18:44:16 +0300 Subject: [PATCH] no message --- .idea/workspace.xml | 17 +- .../CompilationTasksDBTable.java | 4 +- .../Tasks/RunTask/RunTasksDBTable.java | 4 +- src/Visual_DVM_2021/Passes/All/Compile.java | 8 +- .../All/EditProjectCompilationMaxtime.java | 2 - .../Passes/All/EditProjectRunMaxtime.java | 2 - src/Visual_DVM_2021/Passes/All/Run.java | 4 +- .../UI/Interface/DebugWindow.java | 7 + .../UI/Interface/TestingWindow.java | 29 -- src/Visual_DVM_2021/UI/Main/CallbackForm.java | 3 - src/Visual_DVM_2021/UI/Main/DebugForm.java | 44 +- src/Visual_DVM_2021/UI/Main/MainForm.java | 6 +- src/Visual_DVM_2021/UI/Main/ProjectForm.java | 10 +- src/Visual_DVM_2021/UI/Main/TestingForm.form | 397 ------------------ src/Visual_DVM_2021/UI/Main/TestingForm.java | 208 +-------- 15 files changed, 71 insertions(+), 674 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 84a4f072..087750d7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,16 +7,17 @@ - - - - - - - - + + + + + + + + + diff --git a/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java index 89fb2c49..039eb663 100644 --- a/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java +++ b/src/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java @@ -45,12 +45,12 @@ public class CompilationTasksDBTable extends iDBTable { @Override public void ShowCurrentObject() throws Exception { super.ShowCurrentObject(); - UI.getMainWindow().getTestingWindow().DropRunTasksComparison(); + UI.getDebugWindow().DropRunTasksComparison(); } @Override public void ShowNoCurrentObject() throws Exception { super.ShowNoCurrentObject(); - UI.getMainWindow().getTestingWindow().DropRunTasksComparison(); + UI.getDebugWindow().DropRunTasksComparison(); } @Override public void CreateControl() { diff --git a/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java index 2ffff2f3..ff0c108f 100644 --- a/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java +++ b/src/GlobalData/Tasks/RunTask/RunTasksDBTable.java @@ -36,12 +36,12 @@ public class RunTasksDBTable extends iDBTable { @Override public void ShowCurrentObject() throws Exception { super.ShowCurrentObject(); - UI.getMainWindow().getTestingWindow().ShowCurrentRunTask(); + UI.getDebugWindow().ShowCurrentRunTask(); } @Override public void ShowNoCurrentObject() throws Exception { super.ShowNoCurrentObject(); - UI.getMainWindow().getTestingWindow().ShowNoCurrentRunTask(); + UI.getDebugWindow().ShowNoCurrentRunTask(); } @Override public void CreateControl() { diff --git a/src/Visual_DVM_2021/Passes/All/Compile.java b/src/Visual_DVM_2021/Passes/All/Compile.java index 174df584..9e7423b4 100644 --- a/src/Visual_DVM_2021/Passes/All/Compile.java +++ b/src/Visual_DVM_2021/Passes/All/Compile.java @@ -84,12 +84,6 @@ public class Compile extends Pass_2021 { @Override protected void showFinish() throws Exception { Global.db.compilationTasks.ShowUI(compilationTask.getPK()); - UI.getMainWindow().getTestingWindow().ShowLastCompilationTask(); + UI.getDebugWindow().ShowLastCompilationTask(); } - /* - @Override - protected void showCanNotStart() throws Exception { - UI.getNewMainWindow().getTestingWindow().FocusCredentials(); - } - */ } diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java b/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java index 1092dff7..984eafb8 100644 --- a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java +++ b/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java @@ -1,6 +1,5 @@ package Visual_DVM_2021.Passes.All; import Common.Current; -import Common.UI.UI; import Common.UI.Windows.Dialog.SessionMaxtimeDialog; import Visual_DVM_2021.Passes.CurrentProjectPass; public class EditProjectCompilationMaxtime extends CurrentProjectPass { @@ -24,6 +23,5 @@ public class EditProjectCompilationMaxtime extends CurrentProjectPass { } @Override protected void showDone() throws Exception { - UI.getMainWindow().getTestingWindow().ShowProjectMaxCompilationTime(); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java b/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java index 5e58bee9..6fd5e961 100644 --- a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java +++ b/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java @@ -1,6 +1,5 @@ package Visual_DVM_2021.Passes.All; import Common.Current; -import Common.UI.UI; import Common.UI.Windows.Dialog.SessionMaxtimeDialog; import Visual_DVM_2021.Passes.CurrentProjectPass; public class EditProjectRunMaxtime extends CurrentProjectPass { @@ -24,6 +23,5 @@ public class EditProjectRunMaxtime extends CurrentProjectPass { } @Override protected void showDone() throws Exception { - UI.getMainWindow().getTestingWindow().ShowProjectMaxRunTime(); } } diff --git a/src/Visual_DVM_2021/Passes/All/Run.java b/src/Visual_DVM_2021/Passes/All/Run.java index 8ac5872c..91866b7c 100644 --- a/src/Visual_DVM_2021/Passes/All/Run.java +++ b/src/Visual_DVM_2021/Passes/All/Run.java @@ -101,13 +101,13 @@ public class Run extends Pass_2021 { } //- Global.db.runTasks.RefreshUI(); - UI.getMainWindow().getTestingWindow().ShowCurrentRunTask(); + UI.getDebugWindow().ShowCurrentRunTask(); //- if (!task_completed) break; ++i; } if (current_task!=null){ - UI.getMainWindow().getTestingWindow().ShowLastRunTask(); + UI.getDebugWindow().ShowLastRunTask(); } } } diff --git a/src/Visual_DVM_2021/UI/Interface/DebugWindow.java b/src/Visual_DVM_2021/UI/Interface/DebugWindow.java index 1e838a7b..089798f8 100644 --- a/src/Visual_DVM_2021/UI/Interface/DebugWindow.java +++ b/src/Visual_DVM_2021/UI/Interface/DebugWindow.java @@ -3,4 +3,11 @@ import javax.swing.*; public interface DebugWindow { JPanel getContent(); void ShowAll(); + //-- + void DropRunTasksComparison(); + void DropCompilationTasksComparison(); + void ShowLastCompilationTask(); + void ShowCurrentRunTask(); + void ShowLastRunTask(); + void ShowNoCurrentRunTask(); } diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java index 108656eb..b368b1b0 100644 --- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java +++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java @@ -1,28 +1,12 @@ package Visual_DVM_2021.UI.Interface; public interface TestingWindow extends VisualizerForm { void ShowAll(); - void ShowProjectMaxCompilationTime(); - void ShowProjectMaxRunTime(); //- void ShowCurrentTestsPackage(); void DropTestRunTasksComparison(); - void DropRunTasksComparison(); - void DropCompilationTasksComparison(); void ShowCurrentTestRunTask(); void ShowNoTestRunTask(); void DropSapforTasksComparison(); - - default void ShowSession() { - ShowProjectMaxCompilationTime(); - ShowProjectMaxRunTime(); - } - void ShowProject(); - void ShowNoProject(); - //- - void ShowCurrentCompilationTask(); - void ShowNoCurrentCompilationTask(); - void ShowCurrentRunTask(); - void ShowNoCurrentRunTask(); //- void RefreshTabsNames(); void FocusTestingSystem(); @@ -31,17 +15,4 @@ public interface TestingWindow extends VisualizerForm { //- void FocusTestingTasks(); boolean isEmailTestingOn(); - void setUserRights(); - void setAdminRights(); - void setDeveloperRights(); - void FocusScenarios(); - //---------------------------------------->>> - void FocusSapforTasksPackages(); - void ShowCurrentSapforTasksPackage(); - void ShowNoSapforTasksPackage(); - //----------------------------------------->>> - //-- - void ShowLastCompilationTask(); - void ShowLastRunTask(); - //- } diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java index 70abe068..c72c3b20 100644 --- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java +++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java @@ -396,17 +396,14 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { //видит только свои баги. EnableBugreports(); setUserRights(); - UI.getMainWindow().getTestingWindow().setUserRights(); break; case Developer: EnableBugreports(); setDeveloperRights(); - UI.getMainWindow().getTestingWindow().setDeveloperRights(); break; case Admin: EnableBugreports(); setAdminRights(); - UI.getMainWindow().getTestingWindow().setAdminRights(); break; default: EnableBugreports(); diff --git a/src/Visual_DVM_2021/UI/Main/DebugForm.java b/src/Visual_DVM_2021/UI/Main/DebugForm.java index d5338867..9dd3d171 100644 --- a/src/Visual_DVM_2021/UI/Main/DebugForm.java +++ b/src/Visual_DVM_2021/UI/Main/DebugForm.java @@ -37,14 +37,54 @@ public class DebugForm implements DebugWindow, FormWithSplitters { return content; } @Override + public void SaveSplitters() { + FormWithSplitters.super.SaveSplitters(); + try { + Global.db.SaveCredentials(); + } catch (Exception ex) { + Global.Log.PrintException(ex); + } + } + @Override + public void DropRunTasksComparison() { + singleRunTaskMaster.RemoveObject(); + singleRunTaskSlave.RemoveObject(); + } + @Override + public void DropCompilationTasksComparison() { + singleCompilationTaskMaster.RemoveObject(); + singleCompilationTaskSlave.RemoveObject(); + } + @Override + public void ShowLastCompilationTask() { + singleCompilationTaskMaster.ApplyObject(); + } + @Override + public void ShowLastRunTask() { + singleRunTaskMaster.ApplyObject(); + } + @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 ShowAll() { - + Global.db.makefiles.ShowUI(); + Global.db.runConfigurations.ShowUI(); + Global.db.compilationTasks.ShowUI(); //их видимость зависит от текущего проекта. + Global.db.runTasks.ShowUI(); } public DebugForm(){ LoadSplitters(); //-- Global.db.makefiles.mountUI(makefilesPanel); - //----------------------------------------------- Global.db.modules.mountUI(modulesPanel); Global.db.runConfigurations.mountUI(runConfigurationsPanel); Global.db.environmentValues.mountUI(environmentsPanel); diff --git a/src/Visual_DVM_2021/UI/Main/MainForm.java b/src/Visual_DVM_2021/UI/Main/MainForm.java index cd9cf6fd..0e428377 100644 --- a/src/Visual_DVM_2021/UI/Main/MainForm.java +++ b/src/Visual_DVM_2021/UI/Main/MainForm.java @@ -59,8 +59,10 @@ public class MainForm extends Form implements MainWindow { SaveCredentialsPanel(); SaveTestsPanel(); SaveTestingPanel(); + //-- if (UI.debugWindow!=null) ((FormWithSplitters) UI.debugWindow).SaveSplitters(); + //-- Global.FinishApplication(); } public MainForm() { @@ -260,18 +262,16 @@ public class MainForm extends Form implements MainWindow { } @Override public void ShowProject() { - getTestingWindow().ShowProject(); //- saveGlobalTab(); RemoveProjectPanel(); InstallProjectPanel(); restoreGlobalTab(); - getTestingWindow().DropCompilationTasksComparison(); + UI.getDebugWindow().DropCompilationTasksComparison(); UI.mainMenuBar.ShowProject(true); } @Override public void ShowNoProject() { - getTestingWindow().ShowNoProject(); //- saveGlobalTab(); RemoveProjectPanel(); diff --git a/src/Visual_DVM_2021/UI/Main/ProjectForm.java b/src/Visual_DVM_2021/UI/Main/ProjectForm.java index 6e47995a..bb887283 100644 --- a/src/Visual_DVM_2021/UI/Main/ProjectForm.java +++ b/src/Visual_DVM_2021/UI/Main/ProjectForm.java @@ -78,19 +78,11 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { filesForm.Show(); InstallVersionsPanel(); InstallDebugPanel(); + UI.getDebugWindow().ShowAll(); ShowAllAnalyses(); ShowProjectView(); SwitchScreen(Global.db.settings.get(SettingName.SmallScreen).toBoolean()); RefreshTabsNames(); - /* - SC3.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent pce) { - // do here - UI.Info(pce.getNewValue().toString()); - } - }); - */ } @Override public void SaveSplitters() { diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.form b/src/Visual_DVM_2021/UI/Main/TestingForm.form index a8472f04..b775812d 100644 --- a/src/Visual_DVM_2021/UI/Main/TestingForm.form +++ b/src/Visual_DVM_2021/UI/Main/TestingForm.form @@ -18,403 +18,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java index 520679fd..370184b4 100644 --- a/src/Visual_DVM_2021/UI/Main/TestingForm.java +++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java @@ -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 selected_tests = new Vector<>(); - Vector 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();