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 @@
-
+
-
-
+
+
-
-
+
+
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 {
//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 {
@Override
@@ -14,9 +15,12 @@ public class ShowSapforTaskPackage extends Pass_2021 {
}
@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 @@
+
+
+
+
+
+
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;
}