From 2ad0c85331d80d92c2b836fa42d9bdff8c0e83c4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 23 Dec 2023 21:31:56 +0300
Subject: [PATCH] SPF_InsertPrivateFromGUI v++

---
 .idea/workspace.xml                               |  10 ++++++++--
 src/Repository/Component/Sapfor/Sapfor.java       |   4 +++-
 src/Repository/Component/Visualiser.java          |   2 +-
 .../Passes/All/AddSapforPackage.java              |   3 +++
 .../Passes/All/DeleteSapforPackage.java           |   5 +++++
 .../Passes/All/SPF_InsertPrivateFromGUI.java      |   4 ++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java     |   7 ++++++-
 .../Transformations/SPF_InsertPrivateFromGUI.png  | Bin 0 -> 502 bytes
 8 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/SPF_InsertPrivateFromGUI.java
 create mode 100644 src/icons/Transformations/SPF_InsertPrivateFromGUI.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 679b82b6..ec3f9a93 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,14 @@
   </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/SPF_InsertPrivateFromGUI.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_InsertPrivateFromGUI.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/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.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" />
@@ -86,7 +92,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/files" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/Transformations" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -99,11 +105,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\files" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
       <recent name="Repository.Component.Sapfor.Sapfor" />
diff --git a/src/Repository/Component/Sapfor/Sapfor.java b/src/Repository/Component/Sapfor/Sapfor.java
index 925dfc84..3c646da0 100644
--- a/src/Repository/Component/Sapfor/Sapfor.java
+++ b/src/Repository/Component/Sapfor/Sapfor.java
@@ -77,7 +77,8 @@ public abstract class Sapfor extends OSDComponent {
         return new PassCode_2021[]{
                 PassCode_2021.SPF_PrivateShrinking,
                 PassCode_2021.SPF_PrivateExpansion,
-                PassCode_2021.SPF_PrivateRemoving
+                PassCode_2021.SPF_PrivateRemoving,
+                PassCode_2021.SPF_InsertPrivateFromGUI
         };
     }
     public static PassCode_2021[] getProceduresTransformationsCodes() {
@@ -374,6 +375,7 @@ public abstract class Sapfor extends OSDComponent {
         res.add(PassCode_2021.SPF_RemoveDvmDirectivesToComments);
         res.add(PassCode_2021.SPF_RemoveOmpDirectives);
         res.add(PassCode_2021.SPF_RemoveComments);
+        res.add(PassCode_2021.SPF_InsertIncludesPass);
         //--
         res.add(PassCode_2021.SPF_LoopEndDoConverterPass);
         res.add(PassCode_2021.SPF_LoopUnion);
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 297a2cb7..115d659f 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 = 1054;
+        version = 1056;
         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/AddSapforPackage.java b/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java
index e90aecde..d49a76ce 100644
--- a/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java
@@ -91,6 +91,7 @@ public class AddSapforPackage extends AddObjectPass<SapforPackage> {
         return true;
     }
     public boolean getConfigurationCommands(SapforConfiguration sapforConfiguration) {
+        int headers_count = 0;
         //1. получить список всех команд.
         Vector<PassCode_2021> codes = new Vector<>();
         //-- счетчик завершающих команд.
@@ -120,6 +121,8 @@ public class AddSapforPackage extends AddObjectPass<SapforPackage> {
             ))
                 return false;
         }
+
+
         //--
         return true;
     }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java
index 8b4190fc..5ff5fcac 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
+import Common.UI.UI;
 import Common.Utils.Utils;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import Visual_DVM_2021.Passes.DeleteTestingPackages;
@@ -9,6 +10,10 @@ public class DeleteSapforPackage extends DeleteTestingPackages<SapforPackage> {
     public DeleteSapforPackage() {
         super(SapforPackage.class);
     }
+    protected void showPreparation() throws Exception {
+        super.showPreparation();
+        UI.getMainWindow().getTestingWindow().DropSapforComparison();
+    }
     @Override
     protected File getPackagesHome() {
         return Global.SapforPackagesDirectory;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InsertPrivateFromGUI.java b/src/Visual_DVM_2021/Passes/All/SPF_InsertPrivateFromGUI.java
new file mode 100644
index 00000000..6727d658
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InsertPrivateFromGUI.java
@@ -0,0 +1,4 @@
+package Visual_DVM_2021.Passes.All;
+import Visual_DVM_2021.Passes.SapforTransformation;
+public class SPF_InsertPrivateFromGUI extends SapforTransformation {
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 2ae574d9..8aed8c3a 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -311,11 +311,13 @@ public enum PassCode_2021 {
     DownloadDVMPackages,
     DownloadSapforPackage,
     //->
-    TestPass;
+    TestPass, SPF_InsertPrivateFromGUI;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case SPF_InsertPrivateFromGUI:
+                return "Расстановка директив приватностей";
             case CreateTestFromSelectedFiles:
                 return "Создать тест из выделенных файлов";
             case DownloadSapforPackage:
@@ -915,6 +917,9 @@ public enum PassCode_2021 {
             case SPF_GetMaxMinBlockDistribution:
                 name = "GET_MIN_MAX_BLOCK_DIST";
                 break;
+            case SPF_InsertIncludesPass:
+                name = "INSERT_INCLUDES"+" -includeAll";
+                break;
         }
         return p + " " + name;
     }
diff --git a/src/icons/Transformations/SPF_InsertPrivateFromGUI.png b/src/icons/Transformations/SPF_InsertPrivateFromGUI.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f41276b0d3f9bcd8db33c1d685b055d12ec5e35
GIT binary patch
literal 502
zcmV<S0SW$zP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-d`Uz>RCwC#)jeobK@h<4-<fzx;TLMBq)QQOj0)NaNfp#0SlFaV>;(lsir9#P
zg=isyRk{=**hUFNv<U<flY<~OXDK!Ti^IeZG|y%N%ks_-yl8U+kJ+8KGymOrv-2uN
zQP^(T;U7pF^55hXUSKRWwyLmp;ugN6z@@)|^k5jhiLD>C2)>FFxzq1J_F)9i@F{|=
z;TUctyT6NSS%7AcD$ZdFA0o)sQ^PeZ#rzeH{%n`cATwFu0-y01chJBWJitRtXDR$8
z<V+TP9Zzrt&%^c_S23Tg+rUli!Z_~XKCYKRo+gejaUiOtk>tJ~?@CTvU=(kYc|C`m
z%p5LbF2*Za?hm700=ZZQ=}a7llJO$?@Ga6ci-R~DRrW{SB85z15PPwVuNXi#F0`t5
zeT*vFkM~hQ-K}T|TPHb<2|U7WEMN~ha6DQ^SLkYqu3|Sfn?Vl6g7bKjylce8%cT<V
s&P;d3_c{{Us6<9o+P~j6WZUG&0F35`ZA`DeB>(^b07*qoM6N<$f;Y*}_5c6?

literal 0
HcmV?d00001