From 0534eeade3cd1085395bd4847018580a7a440dfe Mon Sep 17 00:00:00 2001 From: 02090095 Date: Thu, 2 Nov 2023 00:01:34 +0300 Subject: [PATCH] no message --- .../UI/Interface/TestingWindow.java | 2 + .../UI/Main/ComparisonForm.java | 4 +- .../UI/Main/SapforVersionsComparisonForm.java | 25 ++++++++++++ src/Visual_DVM_2021/UI/Main/TestingForm.java | 39 ++++++++++++++----- .../UI/Main/VersionsComparisonForm.java | 2 +- 5 files changed, 60 insertions(+), 12 deletions(-) create mode 100644 src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java index af01e8f7..09b27880 100644 --- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java +++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java @@ -16,4 +16,6 @@ public interface TestingWindow extends VisualizerForm { void FocusTestingTasks(); void ShowCurrentSapforPackageVersionEtalon(); void ShowCurrentSapforPackageVersion(); + void ShowNoSapforPackageVersionEtalon(); + void ShowNoSapforPackageVersion(); } diff --git a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java index 0ebf842b..6a65e98b 100644 --- a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java +++ b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java @@ -28,11 +28,11 @@ public abstract class ComparisonForm { protected JToolBar tools; private JPanel editorPanel; protected JLabel lObjectName; - private JButton bApplyObject; + protected JButton bApplyObject; private JButton bPrevious; private JButton bNext; private JButton bCompare; - private JButton bClose; + protected JButton bClose; //-->> ComparisonForm this_ = null; //? ComparisonForm slave = null; diff --git a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java new file mode 100644 index 00000000..1bf39d9b --- /dev/null +++ b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java @@ -0,0 +1,25 @@ +package Visual_DVM_2021.UI.Main; +import Common.Current; +import SapforTestingSystem.Json.SapforVersion_json; +public class SapforVersionsComparisonForm extends ComparisonForm { + Current current; + public SapforVersionsComparisonForm(SapforVersionsComparisonForm slave_in, Current current_in) { + super(SapforVersion_json.class, slave_in); + current = current_in; + bApplyObject.setVisible(false); + bClose.setVisible(false); + } + @Override + protected Current getCurrentObjectName() { + return current; + } + @Override + protected String getText() { + return current.getDescription(); + } + @Override + protected void showObject() { + lObjectName.setText(object.toString()); + lObjectName.setToolTipText(object.toString()); + } +} diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java index 2643ca1b..797b2aae 100644 --- a/src/Visual_DVM_2021/UI/Main/TestingForm.java +++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java @@ -55,22 +55,33 @@ public class TestingForm implements FormWithSplitters, TestingWindow { private final TestRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы. private final TestRunTasksComparisonForm dvmTestingRunSlave; //- - private SapforPackagesComparisonForm sapforTestingMaster; //сравнение тестов SAPFOR. - private SapforPackagesComparisonForm sapforTestingSlave; + private final SapforPackagesComparisonForm sapforPackageTreeMaster; //сравнение деревьев пакетов SAPFOR. + private final SapforPackagesComparisonForm sapforPackageTreeSlave; + //-- + private SapforVersionsComparisonForm sapforVersionMaster; //сравнение версий тестов SAPFOR. + private SapforVersionsComparisonForm sapforVersionSlave; + //-- public TestingForm() { content.add(UI.testingBar, BorderLayout.NORTH); LoadSplitters(); //- dvmTestingRunMaster = new TestRunTasksComparisonForm(dvmTestingRunSlave = new TestRunTasksComparisonForm(null)); - sapforTestingMaster = new SapforPackagesComparisonForm(sapforTestingSlave = new SapforPackagesComparisonForm(null)); + sapforPackageTreeMaster = new SapforPackagesComparisonForm(sapforPackageTreeSlave = new SapforPackagesComparisonForm(null)); + sapforVersionMaster = new SapforVersionsComparisonForm( + sapforVersionSlave = new SapforVersionsComparisonForm(null, Current.SapforVersion), + Current.SapforEtalonVersion + ); //--->>> RefreshTabsNames(); //- SC50.setLeftComponent(dvmTestingRunMaster.getContent()); SC50.setRightComponent(dvmTestingRunSlave.getContent()); //- - SC65.setLeftComponent(sapforTestingMaster.getContent()); - SC66.setLeftComponent(sapforTestingSlave.getContent()); + SC65.setLeftComponent(sapforPackageTreeMaster.getContent()); + SC66.setLeftComponent(sapforPackageTreeSlave.getContent()); + //- + SC65.setRightComponent(sapforVersionMaster.getContent()); + SC66.setRightComponent(sapforVersionSlave.getContent()); //- Global.testingServer.db.configurations.mountUI(configurationsPanel); Global.testingServer.account_db.packages.mountUI(packagesPanel); @@ -105,8 +116,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow { } @Override public void DropSapforComparison() { - sapforTestingMaster.RemoveObject(); - sapforTestingSlave.RemoveObject(); + sapforPackageTreeMaster.RemoveObject(); + sapforPackageTreeSlave.RemoveObject(); + sapforVersionMaster.RemoveObject(); + sapforVersionSlave.RemoveObject(); } @Override public void ShowCurrentTestRunTask() { @@ -138,11 +151,19 @@ public class TestingForm implements FormWithSplitters, TestingWindow { } @Override public void ShowCurrentSapforPackageVersionEtalon() { - System.out.println("Эталон "+ Current.get(Current.SapforEtalonVersion)); + sapforVersionMaster.ApplyObject(); } @Override public void ShowCurrentSapforPackageVersion() { - System.out.println("Не эталон "+ Current.get(Current.SapforVersion)); + sapforVersionSlave.ApplyObject(); + } + @Override + public void ShowNoSapforPackageVersionEtalon() { + sapforVersionMaster.RemoveObject(); + } + @Override + public void ShowNoSapforPackageVersion() { + sapforVersionSlave.RemoveObject(); } @Override public void RemountTestTable() { diff --git a/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java index 81d7b295..277ae45a 100644 --- a/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java +++ b/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java @@ -83,7 +83,7 @@ public class VersionsComparisonForm extends ComparisonForm { for (int i = 0; i < cbFile.getItemCount(); ++i) { DBProjectFile dbProjectFile = cbFile.getItemAt(i); if (Global.db.settings.get(SettingName.ExtensionsOn).toBoolean()) { - //если учитываем исключения, ищем полное совпадение + //если учитываем расширения, ищем полное совпадение if (dbProjectFile.name.equals(file_in.name)) { cbFile.setSelectedIndex(i); return;