From ff3e3003d4ce9b0fbd002fc9e84b5594e0bc4b42 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 14 Dec 2023 19:57:47 +0300
Subject: [PATCH] fix

---
 .idea/workspace.xml                          | 7 -------
 src/TestingSystem/Common/TestingPlanner.java | 2 +-
 src/TestingSystem/Common/TestingServer.java  | 2 +-
 src/TestingSystem/DVM/DVMTestingPlanner.java | 6 ++++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2b579ddc..d6bc17f1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,15 +8,8 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
index 6e7d2e80..db0a4204 100644
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -104,8 +104,8 @@ public abstract class TestingPlanner<P extends TestingPackage> {
                 break;
             case PackageStart:
                 PackageStart();
-                UpdatePackageState(getStateAfterStart());
                 EmailPackage();
+                UpdatePackageState(getStateAfterStart());
                 break;
             case CompilationWorkspacesCreation:
             case CompilationPreparation:
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index ff845012..fb4f812c 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -102,7 +102,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     //--->>
     @Override
     protected void startAdditionalThreads() {
-        testingThread.start();
+      //  testingThread.start();
         testingThread_2023.start();
     }
     protected TestingPlanner_OLD testingPlannerOLD = new TestingPlanner_OLD();
diff --git a/src/TestingSystem/DVM/DVMTestingPlanner.java b/src/TestingSystem/DVM/DVMTestingPlanner.java
index 239b7c0f..167ce2f5 100644
--- a/src/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/DVMTestingPlanner.java
@@ -124,8 +124,9 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
         Vector<String> bodies = new Vector<>();
         String binary = Utils.DQuotes("0");
         //----->>
-        for (LanguageName languageName : programs.keySet())
-            generateForLanguage(dvm_drv, languageName, programs.get(test_language), titles, objects, bodies, flags);
+        for (LanguageName languageName : programs.keySet()) {
+            generateForLanguage(dvm_drv, languageName, programs.get(languageName), titles, objects, bodies, flags);
+        }
         //----->>
         return String.join("\n",
                 "LINK_COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
@@ -239,6 +240,7 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
             RemoteFile file = new RemoteFile(stateDir, state.toString());
             if (user.connection.Exists(file)) {
                 Print("found new state: " + file.name);
+                testingPackage.state = state;
                 return true;
             }
         }