From 20aef1f340244ffc747f3c7f340af796f60d77d0 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 5 Mar 2025 20:25:23 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D1=81=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B8=20=D0=B2=D0=BD=D0=B5=D1=81=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=87=D0=B0=D1=82=D0=B8=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             |  13 ++++++++-----
 properties                                      |   8 ++++----
 src/Common/Utils/Loggable.java                  |   2 +-
 .../Component/Sapfor/Sapfor.java                |  16 +++++++++++-----
 src/_VisualDVM/Constants.java                   |   2 +-
 .../DVM/DVMTasks/DVMCompilationTask.java        |   2 +-
 .../UI/SapforPackageTreeNode.java               |   5 +----
 src/icons/versions/Inactive.png                 | Bin 0 -> 644 bytes
 8 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 src/icons/versions/Inactive.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3cb783ff..48ba0545 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/icons/versions/Inactive.png" afterDir="false" />
       <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/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" 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/TestingSystem/Common/Settings/Settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Settings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -90,7 +93,7 @@
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
     <property name="extract.method.default.visibility" value="public" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/libs/commons-lang-2.6.0.jar" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/versions" />
     <property name="project.structure.last.edited" value="Libraries" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.27322906" />
@@ -103,11 +106,11 @@
       <recent name="controls.Trees" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
       <recent name="_VisualDVM.Constants" />
diff --git a/properties b/properties
index 9676afe2..3ec60335 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\BUG",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
@@ -28,9 +28,9 @@
   "CheckTestingIntervalSeconds": 10,
   "AutoCheckTesting": true,
   "EmailOnTestingProgress": true,
-  "lastMachineId": 28,
-  "lastUserId": 36,
-  "lastCompilerId": 109,
+  "lastMachineId": 13,
+  "lastUserId": 34,
+  "lastCompilerId": 52,
   "RegisterOn": false,
   "SpacesOn": false,
   "EmptyLinesOn": false,
diff --git a/src/Common/Utils/Loggable.java b/src/Common/Utils/Loggable.java
index 261725f3..36019e46 100644
--- a/src/Common/Utils/Loggable.java
+++ b/src/Common/Utils/Loggable.java
@@ -35,8 +35,8 @@ public interface Loggable {
         ex.printStackTrace(writer);
         writer.flush();
         Print(out.toString());
-        Utils_.CopyToClipboard(out.toString());
         if (UI.isActive()) {
+            Utils_.CopyToClipboard(out.toString());
             ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm();
             ff.ShowDialog("Возникло исключение", out.toString());
         }
diff --git a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
index b8bccebc..c6a23b11 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
@@ -2,6 +2,7 @@ package _VisualDVM.ComponentsServer.Component.Sapfor;
 import Common.CommonConstants;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
+import Common.Utils.Vector_;
 import Common.Visual.UI;
 import _VisualDVM.ComponentsServer.Component.OSDComponent;
 import _VisualDVM.ComponentsServer.Component.Visualizer_2;
@@ -17,10 +18,9 @@ import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.nio.charset.Charset;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Vector;
+import java.nio.file.Files;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.*;
 public abstract class Sapfor extends OSDComponent {
     public static final int empty_code = -100;
     public static final int canceled_code = -99;
@@ -213,7 +213,13 @@ public abstract class Sapfor extends OSDComponent {
                 Charset.defaultCharset());
         if (!file.setExecutable(true))
             throw new Exception("Не удалось сделать файл скрипта " + name + " исполняемым!");
-        //--
+        //-- Windows
+        if (!Utils_.isWindows()) {
+            Set<PosixFilePermission> permissions = new HashSet<>();
+            permissions.add(PosixFilePermission.OWNER_EXECUTE);
+            permissions.add(PosixFilePermission.OWNER_READ);
+            Files.setPosixFilePermissions(file.toPath(), permissions);
+        }
         boolean flag = false;
         do {
             try {
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 0048b380..f896b0dd 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 = 1192;
+    public static final int version = 1195;
     public static final int planner_version = 12;
     public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
     //--
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
index b69b33c3..bbfb2937 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
@@ -37,7 +37,7 @@ public class DVMCompilationTask extends DVMTask {
                     checkedEnvironments,
                     kernels_in
             ));
-        } else
+        } else kill
             for (String matrix : matrixes) {
                 runTasks.add(new DVMRunTask(
                         configuration,
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
index 2d04abc3..8317b9f3 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java
@@ -5,11 +5,8 @@ import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode {
     public ImageIcon getIcon() {
+      //  Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
         ImageIcon res = new ImageIcon((getClass().getResource("/icons/versions/" + getImageKey() + ".png")));
-        if (res == null) {
-            Utils_.MainLog.Print("/icons/versions/" + getImageKey() + ".png=NULL");
-            //  res= new ImageIcon((getClass().getResource("/icons/versions/Version.png")));
-        }
         return (getImageKey() != null) ? res : null;
     }
     public abstract String getImageKey();
diff --git a/src/icons/versions/Inactive.png b/src/icons/versions/Inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4afd309e55e47118582fa4f526f43937b5951fb
GIT binary patch
literal 644
zcmV-~0(<?5P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ;3Q0skRCwA{lFd#OK@^3*s;&_k1``1nNQ8x9ZRBNK`#wH|8{Wi?E5nk7LqZIJ
z5yHUCbp7A!qI<@sl9Q8E?sxC0?rVNsTzq@0`c)qvG1dZL$7B4PH`BYjyDx3qPK_}*
z=P<^+(DCsx&Nz2;V(ng@&0sWwS}_L)n6tCJ@y^bV#q;x}wH9M-2g166mRi5N6oS7$
zJw=X=K$Xpz&v`wW9Bxl0hZxh{^=<&uH2k@`x^%ne=bxVT_b~w0qQ;;ihzL?EB0{Yd
zDTPuBHRsMnSUx<Qx!u|9gS)w*X&S6^7;90Ht}rEPjAZZ0-jh-y^-Uxtsxcp(I=3Xo
zcU=IB1!~R^0vaRYJrY9arF5xEL32j7x0g<>jTnOhS}R%#q=d$ZhS0%l4H`(!tU?H`
zLMUyE1r$J}E9m1_@2TEXyeG%lJtHMj&a|UZaH(x0%Ow^lB2Ws_gJrcMFPEgY?Vwso
zKmrPoor`XHeI3U4_o(-nl+cvA_vK72g<2~a$URgCN=*~o({$?P_O|=C{gMC(AgUWE
z4^-9(tPL)zwj*OOs#w@8lk{3o+d#c4P^@j8S8eTjdN1uYY_d+0dRIW3rgaO|ApLan
zf017_8K#gyO%e(2cZ~BBYsr1|A*cg*2m-tUe$M9$^L}gV;J~@he^;xq_FrHq20l2(
eKwiMbzX1SUVU!t25EthF0000<MNUMnLSTYo4Hb<5

literal 0
HcmV?d00001