From 6a3be45b1ace7d27fa1a458c67c4d7a7cfb49503 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 15 Mar 2025 16:06:44 +0300
Subject: [PATCH] ++ fix

---
 .idea/workspace.xml                               |  6 +++++-
 properties                                        |  6 +++---
 src/_VisualDVM/Constants.java                     |  2 +-
 src/_VisualDVM/GlobalData/Tasks/TaskState.java    |  2 +-
 .../TestingSystem/DVM/DVMPackage/DVMPackage.java  | 15 +++++++++++++--
 .../DVM/DVMTasks/UI/DVMRunTasksForm.java          | 15 ---------------
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 87918ead..84ea1c8f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/TaskState.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -59,7 +63,7 @@
     <option name="stateVersion" value="1" />
   </component>
   <component name="ProblemsViewState">
-    <option name="selectedTabId" value="ProjectErrors" />
+    <option name="selectedTabId" value="CurrentFile" />
   </component>
   <component name="ProjectId" id="1UqWSAGBQQNofrCLxSPPtOZrGP7" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
diff --git a/properties b/properties
index 406dd1f1..1ee7de6c 100644
--- a/properties
+++ b/properties
@@ -18,7 +18,7 @@
   "FocusPassesResult": true,
   "collapseCredentials": true,
   "collapseFileGraphs": false,
-  "collapseFileMessages": false,
+  "collapseFileMessages": true,
   "collapseProjectTrees": false,
   "EditorFontSize": 17,
   "ComponentsWindowWidth": 929,
@@ -28,8 +28,8 @@
   "CheckTestingIntervalSeconds": 10,
   "AutoCheckTesting": true,
   "EmailOnTestingProgress": true,
-  "CompleteCompilationOptions": false,
-  "CompleteRunEnvironments": false,
+  "CompleteCompilationOptions": true,
+  "CompleteRunEnvironments": true,
   "CreateEthalonTasks": true,
   "ErasePackageWorkspace": true,
   "lastMachineId": 28,
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 4075697e..6e19b863 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1213;
+    public static final int version = 1214;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/GlobalData/Tasks/TaskState.java b/src/_VisualDVM/GlobalData/Tasks/TaskState.java
index 75cdfccc..88440af4 100644
--- a/src/_VisualDVM/GlobalData/Tasks/TaskState.java
+++ b/src/_VisualDVM/GlobalData/Tasks/TaskState.java
@@ -15,13 +15,13 @@ public enum TaskState implements StatusEnum {
     Finished,
     //--- результирующие
     DoneWithErrors,
+    DoneWithDiffs,
     AbortedByTimeout,
     AbortedByUser,
     Crushed,
     WrongTestFormat,
     InternalError,
     Done,
-    DoneWithDiffs,
     //--- сугубо кластерные.
     Queued,
     NoSuchTask,
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
index fccfe263..24813f97 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -148,7 +148,18 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                     if (Global.normalProperties.CreateEthalonTasks &&
                             !group.type.equals(TestType.Performance)) {
                         if (ethalon == null) {
-                            compilationTasks.add(compilationTask = new DVMCompilationTask(index, configuration, "-s", group, test));
+                            String options_ = "-s";
+                            String environments_ = "";
+
+                            if (Global.normalProperties.CompleteCompilationOptions)
+                                options_ = completeOptions(options_);
+                            if (Global.normalProperties.CompleteRunEnvironments)
+                                environments_ = completeEnvironments(environments_);
+
+                            compilationTasks.add(compilationTask = new DVMCompilationTask(
+                                    index, configuration,
+                                    options_,
+                                    group, test));
                             compilationTask.runTasks.add(ethalon = new DVMRunTask(
                                     index,
                                     compilationTask,
@@ -158,7 +169,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                                     group,
                                     test,
                                     "",
-                                    "-s", "",
+                                    options_, environments_,
                                     kernels));
                             tasksCount++;
                         }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
index 6d4cd024..53743a87 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -63,14 +63,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
                         return RendererStatusEnum.class;
                     }
                 },
-                /*
-                new ColumnInfo<DVMRunTask>("эталон") {
-                    @Override
-                    public Object getFieldAt(DVMRunTask object) {
-                        return object.ethalon_id;
-                    }
-                },
-                 */
                 new ColumnInfo<DVMRunTask>("Матрица") {
                     @Override
                     public Object getFieldAt(DVMRunTask object) {
@@ -204,11 +196,4 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
         super.ShowNoCurrentObject();
         Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowNoCurrentDVMTask();
     }
-    /*
-    @Override
-    protected void MouseAction2() throws Exception {
-        SelectAll(false);
-        Global.mainModule.getPass(PassCode.CompareDVMRunTasks).Do();
-    }
-     */
 }