From 52ce1e78aab9b35edee9c967bda05c74b83b4def Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 21 Dec 2023 18:16:14 +0300
Subject: [PATCH] =?UTF-8?q?fix,=20=D0=BD=D0=B5=20=D1=83=D1=87=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D0=BB=D0=B0=D1=81=D1=8C=20=D0=BD=D0=B0=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=20=D0=BE=D0=BF=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D1=8F.=20=D0=BE=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=89=D0=B0=D0=BB=D0=BE=D1=81=D1=8C=20=D0=B1=D0=B5?=
 =?UTF-8?q?=D0=B7=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                          |  9 +-
 src/TestingSystem/Common/TestingPlanner.java | 91 ++++++++++----------
 2 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1588b357..dea4563b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,8 @@
   </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/CreateTestFromSelectedFiles.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/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.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" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
index 049ab100..58200eae 100644
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -66,11 +66,13 @@ public abstract class TestingPlanner<P extends TestingPackage> {
         ServerCommand(ServerCode.EditObject, testingPackage);
     }
     void EmailPackage() throws Exception {
-        EmailMessage message = new EmailMessage();
-        message.subject = "Состояние пакета задач " + Utils.Brackets(testingPackage) + " изменилось на " + Utils.Brackets(testingPackage.state.getDescription());
-        message.text = testingPackage.description;
-        message.targets.add(testingPackage.sender_address);
-        ServerCommand(ServerCode.Email, message);
+        if (testingPackage.needsEmail == 1) {
+            EmailMessage message = new EmailMessage();
+            message.subject = "Состояние пакета задач " + Utils.Brackets(testingPackage) + " изменилось на " + Utils.Brackets(testingPackage.state.getDescription());
+            message.text = testingPackage.description;
+            message.targets.add(testingPackage.sender_address);
+            ServerCommand(ServerCode.Email, message);
+        }
     }
     //---
     protected abstract ServerCode getActivePackageCode();
@@ -122,48 +124,49 @@ public abstract class TestingPlanner<P extends TestingPackage> {
     }
     // ---
     public void Perform() {
-            try {
-                testingPackage = null;
-                testingPackage = (P) ServerCommand(getActivePackageCode());
-                if (testingPackage != null) {
-                    Print(testingPackage.id + ":" + testingPackage.state.getDescription());
-                    //--
-                    InitSessionCredentials();
-                    if (testingPackage.state.equals(TasksPackageState.Analysis)) {
-                        AnalyseResults();
-                        UpdatePackageState(TasksPackageState.Done);
-                        EmailPackage();
-                    } else {
-                        try {
-                            if (Connect()) {
-                                int ptk_id = (int) ServerCommand(getCheckIfNeedsKillCode(), testingPackage.id);
-                                if (ptk_id!= Constants.Nan) {
-                                    Print("package " + testingPackage.id + " NEEDS TO KILL");
-                                    Kill();
-                                    UpdatePackageState(TasksPackageState.Aborted);
-                                    EmailPackage();
-                                    ServerCommand(ServerCode.DeleteObjectByPK, ptk_id);
-                                } else {
-                                    Session();
-                                }
+        try {
+            testingPackage = null;
+            testingPackage = (P) ServerCommand(getActivePackageCode());
+            if (testingPackage != null) {
+                Print(testingPackage.id + ":" + testingPackage.state.getDescription());
+                //--
+                InitSessionCredentials();
+                if (testingPackage.state.equals(TasksPackageState.Analysis)) {
+                    AnalyseResults();
+                    UpdatePackageState(TasksPackageState.Done);
+                    EmailPackage();
+                } else {
+                    try {
+                        if (Connect()) {
+                            int ptk_id = (int) ServerCommand(getCheckIfNeedsKillCode(), testingPackage.id);
+                            if (ptk_id != Constants.Nan) {
+                                Print("package " + testingPackage.id + " NEEDS TO KILL");
+                                Kill();
+                                UpdatePackageState(TasksPackageState.Aborted);
+                                EmailPackage();
+                                ServerCommand(ServerCode.DeleteObjectByPK, ptk_id);
+                            } else {
+                                Session();
                             }
-                        } catch (Exception ex) {
-                            Print("Ошибка сеанса. Соединение будет разорвано.");
-                            Print(ex.getMessage());
-                            Disconnect();
-                        } finally {}
+                        }
+                    } catch (Exception ex) {
+                        Print("Ошибка сеанса. Соединение будет разорвано.");
+                        Print(ex.getMessage());
+                        Disconnect();
+                    } finally {
                     }
-                    //--
-                    testingPackage.destructor();
-                    testingPackage = null;
-                    System.gc();
-                    //--
                 }
-                //else Print(this.getClass().getSimpleName()+": no active package found");
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            } finally {
-                Utils.sleep(getSleepMillis());
+                //--
+                testingPackage.destructor();
+                testingPackage = null;
+                System.gc();
+                //--
             }
+            //else Print(this.getClass().getSimpleName()+": no active package found");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            Utils.sleep(getSleepMillis());
+        }
     }
 }