From 767fae2e53c3f53f9ab5000bf867412560c9f408 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 18 Sep 2023 23:22:17 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=B8=D1=81=D1=81?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=B4=D1=83=D1=8E=20=D0=BD=D0=B8=D1=82=D0=B8=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  2 ++
 src/Common/Global.java                        | 32 ++++++++-----------
 .../PackageModeSupervisor.java                | 21 ++++++++++++
 src/Common/ModesSupervisors/TestThread.java   | 16 ++++++++++
 4 files changed, 52 insertions(+), 19 deletions(-)
 create mode 100644 src/Common/ModesSupervisors/PackageModeSupervisor.java
 create mode 100644 src/Common/ModesSupervisors/TestThread.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 66d129a0..1b00d03b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,6 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Common/ModesSupervisors/PackageModeSupervisor.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/ModesSupervisors/TestThread.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
     </list>
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 9b271c09..cbe72776 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -1,5 +1,6 @@
 package Common;
 import Common.Database.DataSet;
+import Common.ModesSupervisors.PackageModeSupervisor;
 import Common.UI.Menus_2023.ComponentsMenuBar.ComponentsMenuBar;
 import Common.UI.UI;
 import Common.Utils.Utils;
@@ -14,7 +15,6 @@ import Repository.Component.Sapfor.Sapfor_F;
 import Repository.Component.Sapfor.TransformationPermission;
 import Repository.Server.ComponentsServer;
 import TestingSystem.TestingServer;
-import Visual_DVM_2021.Passes.All.PerformSapforTasksPackage;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 import Visual_DVM_2021.UI.Interface.Loggable;
@@ -350,23 +350,6 @@ public class Global {
         testingServer.Start();
         System.exit(0);
     }
-    public static void PackageMode() throws Exception {
-        Log = new Loggable() {
-            @Override
-            public String getLogHomePath() {
-                return Home;
-            }
-            @Override
-            public String getLogName() {
-                return "PackageMode";
-            }
-        };
-        Log.ClearLog();
-        //--
-        Pass_2021 pass = new PerformSapforTasksPackage();
-        pass.Do(Home);
-        //--
-    }
     //---
     public static void Init(String... args) {
         System.out.println("VisualSapfor.jar started..");
@@ -388,7 +371,18 @@ public class Global {
                     TestingSystemMode();
                     break;
                 case Package:
-                    PackageMode();
+                    Log = new Loggable() {
+                        @Override
+                        public String getLogHomePath() {
+                            return Home;
+                        }
+                        @Override
+                        public String getLogName() {
+                            return "PackageMode";
+                        }
+                    };
+                    Log.ClearLog();
+                    new PackageModeSupervisor().Start();
                     break;
                 case Undefined:
                     break;
diff --git a/src/Common/ModesSupervisors/PackageModeSupervisor.java b/src/Common/ModesSupervisors/PackageModeSupervisor.java
new file mode 100644
index 00000000..3aaf8e37
--- /dev/null
+++ b/src/Common/ModesSupervisors/PackageModeSupervisor.java
@@ -0,0 +1,21 @@
+package Common.ModesSupervisors;
+import Common.Global;
+import Common.Utils.InterruptThread;
+public class PackageModeSupervisor {
+    protected Thread interruptThread = new InterruptThread(5000, () -> {System.exit(0);return null;});
+    public void Start() {
+        try {
+            interruptThread.start();
+            for (int i=1; i<=3; ++i){
+                Thread thread = new TestThread(i);
+                thread.start();
+            }
+            interruptThread.wait();
+            Global.Log.Print("INTERRUPT THREAD DONE");
+           // Pass_2021 pass = new PerformSapforTasksPackage();
+           // pass.Do(Global.Home);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+}
diff --git a/src/Common/ModesSupervisors/TestThread.java b/src/Common/ModesSupervisors/TestThread.java
new file mode 100644
index 00000000..1683d386
--- /dev/null
+++ b/src/Common/ModesSupervisors/TestThread.java
@@ -0,0 +1,16 @@
+package Common.ModesSupervisors;
+import Common.Global;
+public class TestThread extends Thread{
+    public TestThread(int num){
+        super(() -> {
+            try {
+                while (true) {
+                    Global.Log.Print("Test thread " +num+ "action");
+                    Thread.sleep(1000);
+                }
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        });
+    }
+}