From cd439030e8376583c3516fa143ab00273e8026b9 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 26 Oct 2023 20:46:03 +0300
Subject: [PATCH] =?UTF-8?q?fix.=20=D0=B1=D1=8B=D0=BB=20=D0=B1=D0=B0=D0=B3?=
 =?UTF-8?q?=20=D0=B2=20=D0=BF=D1=83=D1=82=D0=B8=20=D0=B7=D0=B0=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=BA=D0=B0=D1=87=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                    | 10 +++++-----
 .../SapforTasksPackageInterface.java                   |  2 +-
 .../SapforTasksPackage/SapforTasksPackageTree.java     |  3 +++
 src/TestingSystem/TestingServer.java                   |  2 ++
 .../Passes/All/ShowSapforTaskPackage.java              |  8 ++++++--
 src/Visual_DVM_2021/UI/Main/SapforPackageFields.form   |  6 ++++++
 src/Visual_DVM_2021/UI/Main/SapforPackageFields.java   |  1 +
 7 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dbe06f61..bf73c783 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,13 @@
   </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/UI/Main/SapforPackageFields.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.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/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/FormType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Windows/FormType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index 6d605cab..36820c59 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -4,6 +4,6 @@ import Common.Global;
 import java.io.File;
 public class SapforTasksPackageInterface {
     public static File getPackageArchive(SapforTasksPackage package_in){
-        return new File(Global.SapforPackagesDirectory, package_in.workspace+".zip");
+        return new File(Global.SapforPackagesDirectory, package_in.id+".zip");
     }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
new file mode 100644
index 00000000..fceaf92b
--- /dev/null
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
@@ -0,0 +1,3 @@
+package SapforTestingSystem.SapforTasksPackage;
+public class SapforTasksPackageTree {
+}
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index 381b180b..4a386e6d 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -396,6 +396,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 //1 - архивировать пакет.
                 File packageArchive = SapforTasksPackageInterface.getPackageArchive(sapforTasksPackage);
                 Utils.forceDeleteWithCheck(packageArchive);
+                System.out.println("src = "+Utils.Brackets(sapforTasksPackage.workspace));
+                System.out.println("dst="+Utils.Brackets(packageArchive.getAbsolutePath()));
                 //---
                 ZipFolderPass zip = new ZipFolderPass();
                 if (zip.Do(sapforTasksPackage.workspace, packageArchive.getAbsolutePath())) {
diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
index 373dc589..95e6a46f 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
     @Override
@@ -14,9 +15,12 @@ public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.SapforTasksPackage)){
+        if (Current.Check(Log, Current.SapforTasksPackage)) {
             target = Current.getSapforTasksPackage();
-            return true;
+            if (!target.state.equals(TasksPackageState.Done)) {
+                Log.Writeln_("Пакет не завершен!");
+            } else
+                return true;
         }
         return false;
     }
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
index 43212fcd..baa6588e 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
@@ -104,6 +104,12 @@
                   </component>
                 </children>
               </toolbar>
+              <grid id="a1b9a" binding="treePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                <constraints border-constraint="Center"/>
+                <properties/>
+                <border type="none"/>
+                <children/>
+              </grid>
             </children>
           </grid>
           <grid id="98e2e" layout-manager="BorderLayout" hgap="0" vgap="0">
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
index 9fbbf626..3fe1057f 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
@@ -13,6 +13,7 @@ public class SapforPackageFields implements DialogFields, FormWithSplitters {
     private JButton bPrevious;
     private JButton bNext;
     private JButton bCompare;
+    private JPanel treePanel;
     public JPanel getContent() {
         return content;
     }