From 10c03b6032cdba1ad89db102ce0d3e84af172116 Mon Sep 17 00:00:00 2001 From: 02090095 Date: Wed, 1 Nov 2023 23:14:49 +0300 Subject: [PATCH] no message --- .../SapforTasksPackageTree.java | 14 +++++++++----- .../UI/Interface/TestingWindow.java | 2 ++ .../UI/Main/SapforVersionComparisonForm.java | 16 ---------------- src/Visual_DVM_2021/UI/Main/TestingForm.java | 9 +++++++++ 4 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 src/Visual_DVM_2021/UI/Main/SapforVersionComparisonForm.java diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java index c2f218b9..f00b5918 100644 --- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java +++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java @@ -1,8 +1,7 @@ package SapforTestingSystem.SapforTasksPackage; import Common.Current; import Common.UI.Trees.DataTree; -import Common.Utils.Utils; -import ProjectData.Files.ProjectFile; +import Common.UI.UI; import SapforTestingSystem.Json.SapforVersion_json; import javax.swing.tree.DefaultMutableTreeNode; @@ -28,20 +27,25 @@ public class SapforTasksPackageTree extends DataTree { } @Override public void SelectionAction(TreePath e) { - System.out.println("Select"); + System.out.println("Select " + current); DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent(); - // Current.set(Current.ProjectNode, node); + // Current.set(Current.ProjectNode, node); Object o = node.getUserObject(); if (o instanceof SapforVersion_json) { SapforVersion_json version = (SapforVersion_json) o; Current.set(current, version); + /* System.out.println(version.version+" files: "+version.files.size()); for (ProjectFile file: version.files){ System.out.println(Utils.Brackets(file)); } System.out.println("---"); - + */ + if (current.equals(Current.SapforEtalonVersion)) + UI.getMainWindow().getTestingWindow().ShowCurrentSapforPackageVersionEtalon(); + else + UI.getMainWindow().getTestingWindow().ShowCurrentSapforPackageVersion(); } } } \ No newline at end of file diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java index 8b30174b..af01e8f7 100644 --- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java +++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java @@ -14,4 +14,6 @@ public interface TestingWindow extends VisualizerForm { void RemountTestTable(); //- void FocusTestingTasks(); + void ShowCurrentSapforPackageVersionEtalon(); + void ShowCurrentSapforPackageVersion(); } diff --git a/src/Visual_DVM_2021/UI/Main/SapforVersionComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforVersionComparisonForm.java deleted file mode 100644 index abacbb52..00000000 --- a/src/Visual_DVM_2021/UI/Main/SapforVersionComparisonForm.java +++ /dev/null @@ -1,16 +0,0 @@ -package Visual_DVM_2021.UI.Main; -import Common.Current; -import SapforTestingSystem.Json.SapforVersion_json; -public class SapforVersionComparisonForm extends ComparisonForm { - public SapforVersionComparisonForm(SapforVersionComparisonForm slave_in) { - super(SapforVersion_json.class, slave_in); - } - @Override - protected Current getCurrentObjectName() { - return null; - } - @Override - protected String getText() { - return null; - } -} diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java index 18fa9dfe..2643ca1b 100644 --- a/src/Visual_DVM_2021/UI/Main/TestingForm.java +++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java @@ -1,4 +1,5 @@ package Visual_DVM_2021.UI.Main; +import Common.Current; import Common.Global; import Common.UI.TextField.StyledTextField; import Common.UI.UI; @@ -136,6 +137,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow { public void FocusTestingTasks() { } @Override + public void ShowCurrentSapforPackageVersionEtalon() { + System.out.println("Эталон "+ Current.get(Current.SapforEtalonVersion)); + } + @Override + public void ShowCurrentSapforPackageVersion() { + System.out.println("Не эталон "+ Current.get(Current.SapforVersion)); + } + @Override public void RemountTestTable() { UI.Clear(packagesPanel); UI.Clear(testsRunTasksPanel);