v++

.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" />

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("Отображение параллельных вариантов",
+        addPasses(PassCode_2021.ShowAllParallelVariants, PassCode_2021.ShowParallelVariantsCoverage,
-                "/icons/ShowPassword.png") {
+                PassCode_2021.PredictParallelVariants, PassCode_2021.CreateParallelVariants);
-            {
-                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);
     }
 }

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());

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);
+    }
+}

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);
+    }
+}

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: