From 4572214c454695dd670612289a2b4861cb6083c8 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 7 Oct 2023 18:57:32 +0300
Subject: [PATCH] v++

---
 .idea/workspace.xml                           |   9 +++++--
 .../VariantsMenuBar/VariantsMenuBar.java      |  22 ++----------------
 src/Repository/Component/Visualiser.java      |   2 +-
 .../Passes/All/ShowAllParallelVariants.java   |  15 ++++++++++++
 .../All/ShowParallelVariantsCoverage.java     |  15 ++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |   7 ++++++
 src/icons/AllVariants.png                     | Bin 0 -> 1816 bytes
 src/icons/VariantsCoverage.png                | Bin 0 -> 2131 bytes
 8 files changed, 47 insertions(+), 23 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/ShowAllParallelVariants.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/ShowParallelVariantsCoverage.java
 create mode 100644 src/icons/AllVariants.png
 create mode 100644 src/icons/VariantsCoverage.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f93d0faa..a67eecca 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowAllParallelVariants.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowParallelVariantsCoverage.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/AllVariants.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/VariantsCoverage.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -100,11 +105,11 @@
       <recent name="controls.Trees" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Transformations" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Editor" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\files\Planner" />
-      <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\All" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
       <recent name="Common.Constants" />
diff --git a/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java b/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
index a28bbf92..91289a36 100644
--- a/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
+++ b/src/Common/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
@@ -1,28 +1,10 @@
 package Common.UI.Menus_2023.VariantsMenuBar;
-import Common.UI.Menus.VisualiserMenuItem;
 import Common.UI.Menus_2023.DataMenuBar;
-import Common.UI.Menus_2023.VisualiserMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
 public class VariantsMenuBar extends DataMenuBar {
     public VariantsMenuBar() {
         super("варианты");
-        addMenus(new VisualiserMenu("Отображение параллельных вариантов",
-                "/icons/ShowPassword.png") {
-            {
-                add(new VisualiserMenuItem("Все варианты") {
-                    {
-                        addActionListener(e -> Pass_2021.passes.get(PassCode_2021.GenerateParallelVariants).Do(true));
-                    }
-                });
-                add(new VisualiserMenuItem("Минимальное покрытие вариантов") {
-                    {
-                        addActionListener(e -> Pass_2021.passes.get(PassCode_2021.GenerateParallelVariants).Do(false));
-                    }
-                });
-            }
-            ;
-        });
-        addPasses(PassCode_2021.PredictParallelVariants, PassCode_2021.CreateParallelVariants);
+        addPasses(PassCode_2021.ShowAllParallelVariants, PassCode_2021.ShowParallelVariantsCoverage,
+                PassCode_2021.PredictParallelVariants, PassCode_2021.CreateParallelVariants);
     }
 }
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 8498f39e..b9013680 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1018;
+        version = 1019;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/Visual_DVM_2021/Passes/All/ShowAllParallelVariants.java b/src/Visual_DVM_2021/Passes/All/ShowAllParallelVariants.java
new file mode 100644
index 00000000..8a56363c
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/ShowAllParallelVariants.java
@@ -0,0 +1,15 @@
+package Visual_DVM_2021.Passes.All;
+public class ShowAllParallelVariants extends GenerateParallelVariants{
+    @Override
+    public String getIconPath() {
+        return "/icons/AllVariants.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        return super.canStart(true);
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/ShowParallelVariantsCoverage.java b/src/Visual_DVM_2021/Passes/All/ShowParallelVariantsCoverage.java
new file mode 100644
index 00000000..66a7a9ce
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/ShowParallelVariantsCoverage.java
@@ -0,0 +1,15 @@
+package Visual_DVM_2021.Passes.All;
+public class ShowParallelVariantsCoverage extends GenerateParallelVariants {
+    @Override
+    public String getIconPath() {
+        return "/icons/VariantsCoverage.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        return super.canStart(false);
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index a4ecf22f..53056339 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -2,6 +2,9 @@ package Visual_DVM_2021.Passes;
 public enum PassCode_2021 {
     Undefined,
     //-
+    ShowAllParallelVariants,
+    ShowParallelVariantsCoverage,
+    //-
     DeleteServerSapfor,
     StartSapforTestsOnServer,
     InstallServerSapfor,
@@ -313,6 +316,10 @@ public enum PassCode_2021 {
         switch (this) {
             case Undefined:
                 return "?";
+            case ShowAllParallelVariants:
+                return "Отобразить все параллельные варианты";
+            case ShowParallelVariantsCoverage:
+                return "Отобразить минимальное покрытие параллельных вариантов";
             case DeleteSapforScenario:
                 return "Удалить сценарий SAPFOR";
             case DeleteServerSapfor:
diff --git a/src/icons/AllVariants.png b/src/icons/AllVariants.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ae1cece97677a5acffe35938003dc234824bfee
GIT binary patch
literal 1816
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
GLSTX+>sY=3

literal 0
HcmV?d00001

diff --git a/src/icons/VariantsCoverage.png b/src/icons/VariantsCoverage.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7bf4770f48cb6efa8675871cfe5891321e7ab1d
GIT binary patch
literal 2131
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
JPDHLkV1k081#18R

literal 0
HcmV?d00001