From 78ee5bc4286133a140329896c4e6dfafebb46320 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 20 Mar 2025 18:14:41 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=81=D0=BF=D1=84=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  27 +++++-------------
 properties                                    |   4 +--
 .../Component/Sapfor/Sapfor.java              |   3 +-
 src/_VisualDVM/Constants.java                 |   2 +-
 .../Passes/All/SPF_GetGraphLoops.java         |   2 +-
 .../Passes/All/SPF_RemoveSpfDirectives.java   |   4 +++
 src/_VisualDVM/Passes/PassCode.java           |   3 ++
 src/_VisualDVM/Passes/Sapfor/SapforPass.java  |   1 -
 .../SPF_RemoveSpfDirectives.png               | Bin 0 -> 1501 bytes
 9 files changed, 20 insertions(+), 26 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/SPF_RemoveSpfDirectives.java
 create mode 100644 src/icons/Transformations/SPF_RemoveSpfDirectives.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0295c7d8..5448d5b4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,28 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/projectFile_.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestFile/TestFile.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestFile/TestFilesDBTable.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_RemoveSpfDirectives.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_RemoveSpfDirectives.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/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.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/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/ProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/ProjectFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/TestCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/TestCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Group.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/LocalDVMTestingPlanner.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforPass.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -107,7 +94,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$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/Transformations" />
     <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" />
@@ -120,11 +107,11 @@
       <recent name="controls.Trees" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\TestingSystem\DVM\DVMTasks\UI" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Passes\All" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
       <recent name="_VisualDVM.ComponentsServer.Component.Sapfor.Sapfor" />
diff --git a/properties b/properties
index 99e7403f..9f41f1a8 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
+  "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
@@ -18,7 +18,7 @@
   "FocusPassesResult": false,
   "collapseCredentials": true,
   "collapseFileGraphs": false,
-  "collapseFileMessages": true,
+  "collapseFileMessages": false,
   "collapseProjectTrees": false,
   "EditorFontSize": 17,
   "ComponentsWindowWidth": 929,
diff --git a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
index 106c7816..b7152bfe 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
@@ -90,7 +90,8 @@ public abstract class Sapfor extends OSDComponent {
         return new PassCode[]{
                 PassCode.SPF_RemoveDvmDirectivesToComments,
                 PassCode.SPF_RemoveDvmDirectives,
-                PassCode.SPF_RemoveOmpDirectives
+                PassCode.SPF_RemoveOmpDirectives,
+                PassCode.SPF_RemoveSpfDirectives
         };
     }
     public static PassCode[] getIntervalsTransformationsCodes() {
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 55b38268..12a1ad68 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 = 1219;
+    public static final int version = 1220;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java b/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
index aa3f4f62..a7be6cc9 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
@@ -37,7 +37,7 @@ public class SPF_GetGraphLoops extends SapforAnalysis {
     }
     @Override
     protected void unpack(String packed) throws Exception {
-        System.out.println(Utils_.Brackets(packed));
+        //System.out.println(Utils_.Brackets(packed));
         Vector<String> done_programs = new Vector<>();
         String[] splitedPackedGraph = packed.split("\\|");
         for (int i = 0; i < splitedPackedGraph.length; i += 2) {
diff --git a/src/_VisualDVM/Passes/All/SPF_RemoveSpfDirectives.java b/src/_VisualDVM/Passes/All/SPF_RemoveSpfDirectives.java
new file mode 100644
index 00000000..efe15f12
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/SPF_RemoveSpfDirectives.java
@@ -0,0 +1,4 @@
+package _VisualDVM.Passes.All;
+import _VisualDVM.Passes.Sapfor.SapforTransformation;
+public class SPF_RemoveSpfDirectives extends SapforTransformation {
+}
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index 21026aa5..36295dbf 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -302,6 +302,7 @@ public enum PassCode implements PassCode_ {
     //->
     TestPass,
     SPF_InsertPrivateFromGUI,
+    SPF_RemoveSpfDirectives,
     SPF_RemoveDeadCode,
     ReplaceTestProject,
     ReplaceTestsFromFiles,
@@ -363,6 +364,8 @@ public enum PassCode implements PassCode_ {
     @Override
     public String getDescription() {
         switch (this) {
+            case SPF_RemoveSpfDirectives:
+                return "Удаление SPF директив";
             case DeleteRemoteWorkspace:
                 return "Удалить рабочее пространство пользователя";
             case CompareDVMRunTaskToEthalon:
diff --git a/src/_VisualDVM/Passes/Sapfor/SapforPass.java b/src/_VisualDVM/Passes/Sapfor/SapforPass.java
index d98d7dae..7696c09b 100644
--- a/src/_VisualDVM/Passes/Sapfor/SapforPass.java
+++ b/src/_VisualDVM/Passes/Sapfor/SapforPass.java
@@ -23,7 +23,6 @@ public class SapforPass extends SilentSapforPass {
     }
     @Override
     public void Interrupt() throws Exception {
-        //  target.CreateInterruptFile();
         Global.mainModule.getSapfor().Interrupt();
     }
 }
diff --git a/src/icons/Transformations/SPF_RemoveSpfDirectives.png b/src/icons/Transformations/SPF_RemoveSpfDirectives.png
new file mode 100644
index 0000000000000000000000000000000000000000..799bc8ea2b4109e1971e5d8fa59e653f1a6f0c9f
GIT binary patch
literal 1501
zcmV<31tR*1P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkPHfcjcP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-pOwu}Z^G6hP05
zqT*011aWY9lPD;*>R`sCEkzKl)gj5&q@hY_5?)@_euSf22N!q0z{yc?Q2YY_Kym8e
z5Fvwu2%hQO!{u_psMvL<VU%GIYt?Q#()D~f`@{@W0MH4u)NZv70OBN$_`&BZ0^oVm
zt~(9>#(bD64NQRTZj^-}DnS22ry9f<FoS-oLEHhRI%(HHJOHI$?k_+o$o&l{DcAEs
zd;n(8^?Weq05iya1u%7VsR3$9I#Or7Q!T5OWl6i61d%)*WjY#Uaz73el_sjAqb`vD
z2f$*!*ls#<t!i0&>-;mW=gZvQj}U-ZdMsK&I8^7~DvX`q=i<hA84hn@dQ!CAE4bN!
zh3lfNR-wEF_v0_X#!vm|T2EpC001CkNK#Dz0D2_=0Dyx40Qvs_0D$NK08$750ToyP
z06Lcd02go9S|5-A00bdPL_t(|+O(BVXd_h|$G`8r=_Hfp-=s~pnPi(LP1CeZntz=(
zo21Fi<jv#{y@)HgD65DbM0#>X_aY*A@#G>dg6?e*DSHqUSCB<^S3wUISro-T=wU^#
zO7*smhn+~;gl>yE@D9U+&*%5P^ZUJlZQJ-i*S?ofNJcOifF!v=2u2=BayxtfY~Byx
zbpSm|DHvk_fKq7{olYB^YyV1cT9Txj$z<Y1O6fNM9{A4$0M2<lp6m5`HQw)ASX(RS
zB}w`cz-s`+Vlh7ukYfu7As2i;@0Dh==5-)Kr_)BO)tHP#!j}QOrK)9OSq9}?W5*G=
z0PKW9@~fKG7*r^5t_h~86U)*OiG-hHjD6c|)|qMQ>^OobA>`WP;=*~;)ZtVoaIOiK
zWxz0+EEEb}aJgJxO;3j|S(Y)7A4!lE#fgs#h1}V0m&2({7(}CKjeyrX`A#Bn^8D=V
z$?Zhq<kQ_QKeC_(;Mc{)g-5owI^bN}2jASRB_&C^o=hg5*xKqqmIH4W3c1ap_zo4E
zCWPz}LTo`0eq370^g5k3OjD=5o{9DKN>voa&oY^`)$d!#WYW(_lKYxrG)2?Y=~%(k
zR0y&h#KeSf4uDMvu?ZnI02{y^MVWa)*Ef+)r|$Flyf+JlT#j=Mfq?%NO6jhumSRKs
zj|wEo4N(*yWQ^XSl<pmrOiT#Bcs!mRzu)(sVKh$|MiU;7XD1j8T&-5s$!@nj3?CIx
zN&(<~zu*5!xm-y4{k{*K>g`ZS{-9P{54+v&&kKcoqt$Bo+-}#6SS)(UvJ7-O#zDBi
zxkmR17-J$K<R=Gsd40VSR+Q*Vkx2NBR;w<{a^PJ`>0U0kd`c9>TdCCC^G;{caqy9=
zf>K%_g#0y#L=?sEi^Y6#bMsWh>z(`pfGr5@H$h-OWU~toJMB2=EOr1+#+-mYKFE9^
zNvBf}&CHy5c@PyL<aR#4+&BOi#=u9v0U@MH2>E?T@@KJ_UyvmCEvNe3QfYO5Xpjzr
zj|u>Q5K;iJ3&8ezCqG?XT`2;v{eIt7RV@d4y(7a%1&lGcTq1lvujuo6F9P_3QhHla
zqHmg}PVe5Db(wRGIYWm-;G+UnEu&ghQLU;$O=}>ZUuooWOQvb+Fio8<FE5(2v+>8e
zU5;FCsZy_R#GMWrseG&;m72r+d=k^sQ)jZ-jM48~==Uw8QgdhGapkF4OnKBWnlOx}
zNGbg}nVi#yukCxD;O@Y*(Qdb(DADa`bmqx;T-nZM7tS`DHCL-uXO&7Z6An*(1mH?O
zzd|g_U`G~ku7Punnx-yruAx@jQ0ny!x!<=CkH?;6jD1Zh{SLszTyELb?Q(hue5`;t
z`7zEl=44MyQ>Tqab$V^Bl-<~<1XQ&=_@l9Vt-l8VeO*|KJTesa00000NkvXXu0mjf
D_G-4f

literal 0
HcmV?d00001