From 7972fe5dc24c4cebe29d13fd2cb983ba0fb2ae42 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 1 Nov 2023 19:06:07 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=BC=D0=B0=D1=86=D0=B8=D1=8E=20=D1=80=D0=B0?=
 =?UTF-8?q?=D1=81=D0=BF=D0=B0=D0=BA=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=B5=D1=82=D0=B0=20=D1=81=D0=B0=D0=BF=D1=84=D0=BE=D1=80?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=B5=D0=B3=D0=BE=20=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=87=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  5 ++-
 src/Common/UI/UI.java                         |  4 +--
 src/ProjectData/Messages/Message.java         |  9 ++++--
 src/Repository/Component/Visualiser.java      |  2 +-
 .../All/DownloadSapforTasksPackage.java       | 12 +------
 .../Passes/All/UnpackSapforTasksPackage.java  | 32 +++++++++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 ++
 src/Visual_DVM_2021/Passes/SapforPass.java    |  7 +++-
 .../UI/Main/SapforPackagesComparisonForm.java |  3 ++
 9 files changed, 59 insertions(+), 18 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c844be00..57030572 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,10 @@
   <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/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.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/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.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/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 33f0f394..86549ac2 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -245,7 +245,7 @@ public class UI {
         });
         menuBars.put(VariantsSet.class, new VariantsMenuBar());
         menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
-        menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode_2021.SaveProfile, PassCode_2021.EditProfile, PassCode_2021.ApplyProfile,PassCode_2021.DeleteProfile));
+        menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode_2021.SaveProfile, PassCode_2021.EditProfile, PassCode_2021.ApplyProfile, PassCode_2021.DeleteProfile));
         menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
         menuBars.put(SapforTasksDBTable.class, new SapforTasksMenuBar());
         //---->>
@@ -437,7 +437,7 @@ public class UI {
         versionsWindow = new VersionsForm(Current.getRoot());
     }
     public static DebugWindow getDebugWindow() {
-        if (debugWindow==null)
+        if (debugWindow == null)
             debugWindow = new DebugForm();
         return debugWindow;
     }
diff --git a/src/ProjectData/Messages/Message.java b/src/ProjectData/Messages/Message.java
index 44332822..d609668b 100644
--- a/src/ProjectData/Messages/Message.java
+++ b/src/ProjectData/Messages/Message.java
@@ -2,6 +2,7 @@ package ProjectData.Messages;
 import Common.Constants;
 import Common.Current;
 import Common.Global;
+import Common.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.FileObject;
 import ProjectData.SapforData.FileObjectWithMessages;
@@ -388,8 +389,12 @@ public class Message extends FileObject {
                             idx += 2;
                         }
                     } while (idx != -1);
-                    if (sum != splited.length && !message.equals(""))
-                        throw new PassException("Ошибка при декодировании сообщений на русском языке");
+                    if (sum != splited.length && !message.equals("")) {
+                        System.out.println("message="+ Utils.Brackets(message));
+                        Utils.CopyToClipboard(message);
+                        throw new PassException("Ошибка при декодировании сообщений на русском языке\n" +
+                                "message=" + Utils.Brackets(message));
+                    }
                     idx = 0;
                     String result = "";
                     for (int z = 0; z < sum; ++z) {
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index ec33d294..29adbe88 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 = 1024;
+        version = 1025;
         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/DownloadSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
index e5cef1a5..e6c2f1f6 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
@@ -1,6 +1,5 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
-import Common.Global;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
@@ -9,10 +8,8 @@ import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import TestingSystem.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
-import org.apache.commons.io.FileUtils;
 
 import java.io.File;
-import java.util.Date;
 public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {
     @Override
     public String getIconPath() {
@@ -55,14 +52,7 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
     @Override
     protected void performDone() throws Exception {
         super.performDone();
-        File packageWorkspace = SapforTasksPackageInterface.getLocalWorkspace(target);
-        Utils.forceDeleteWithCheck(packageWorkspace);
-        if (passes.get(PassCode_2021.UnzipFolderPass).Do(
-                tmpArchive.getAbsolutePath(),
-                Global.SapforPackagesDirectory.getAbsolutePath(), false
-        )) {
-            FileUtils.writeStringToFile(SapforTasksPackageInterface.getLoadedSign(target), new Date().toString());
-        }
+        passes.get(PassCode_2021.UnpackSapforTasksPackage).Do(tmpArchive, target);
     }
 }
 
diff --git a/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java
new file mode 100644
index 00000000..88c85c77
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java
@@ -0,0 +1,32 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Global;
+import Common.Utils.Utils;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.util.Date;
+public class UnpackSapforTasksPackage extends UnzipFolderPass<SapforTasksPackage> {
+    @Override
+    protected boolean needsAnimation() {
+        return true;
+    }
+    @Override
+    protected boolean canStart(Object... args) {
+        File tmpArchive = (File) args[0];
+        target = (SapforTasksPackage) args[1];
+        return super.canStart(tmpArchive.getAbsolutePath(),Global.SapforPackagesDirectory.getAbsolutePath(), false);
+    }
+    @Override
+    protected void performPreparation() throws Exception {
+        super.performPreparation();
+        File packageWorkspace = SapforTasksPackageInterface.getLocalWorkspace(target);
+        Utils.forceDeleteWithCheck(packageWorkspace);
+    }
+    @Override
+    protected void body() throws Exception {
+        super.body();
+        FileUtils.writeStringToFile(SapforTasksPackageInterface.getLoadedSign(target), new Date().toString());
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 15d369ba..3fbc1c8e 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -5,6 +5,7 @@ public enum PassCode_2021 {
     ShowAllParallelVariants,
     ShowParallelVariantsCoverage,
     AbortSapforTaskPackage,
+    UnpackSapforTasksPackage,
     //-
     DeleteServerSapfor,
     StartSapforTests,
@@ -311,6 +312,8 @@ public enum PassCode_2021 {
         switch (this) {
             case Undefined:
                 return "?";
+            case UnpackSapforTasksPackage:
+                return "Распаковка пакета задач SAPFOR";
             case ShowSapforTaskPackage:
                 return "Отобразить пакет задач SAPFOR";
             case DownloadSapforTasksPackage:
diff --git a/src/Visual_DVM_2021/Passes/SapforPass.java b/src/Visual_DVM_2021/Passes/SapforPass.java
index 3a717b5f..3a670713 100644
--- a/src/Visual_DVM_2021/Passes/SapforPass.java
+++ b/src/Visual_DVM_2021/Passes/SapforPass.java
@@ -10,7 +10,12 @@ public class SapforPass extends SilentSapforPass {
     @Override
     protected void performFinish() throws Exception {
         target.db.BeginTransaction();
-        unpackMessages();
+        try {
+            unpackMessages();
+        }
+        catch (PassException ex){
+            Log.Writeln_(ex.getMessage());
+        }
         target.db.Commit();
     }
     protected void unpackMessages() throws Exception {
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index 79845d88..ba71eb66 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -8,6 +8,7 @@ import Common.Utils.TextLog;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
+import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import javax.swing.*;
@@ -52,7 +53,9 @@ public class SapforPackagesComparisonForm {
         TextLog log = new TextLog();
         if (Current.Check(log, Current.SapforTasksPackage)) {
             object = Current.getSapforTasksPackage();
+            if (SapforTasksPackageInterface.isLoaded(object)||(Pass_2021.passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(object)))
             showObject();
+            else UI.Info("Пакет не закружен");
         } else
             UI.Info(log.toString());
     }