M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix. был баг в пути запаковки пакета при скачивании

Browse Source
This commit is contained in:
02090095
2023-10-26 20:46:03 +03:00
parent b309745e35
commit cd439030e8
7 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/workspace.xml generated
View File

@@ -7,13 +7,13 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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$/.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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.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/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/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/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/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.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
View File

@@ -4,6 +4,6 @@ import Common.Global;
import java.io.File; import java.io.File;
public class SapforTasksPackageInterface { public class SapforTasksPackageInterface {
public static File getPackageArchive(SapforTasksPackage package_in){ 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");
} }
} }

3
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java Normal file
View File

@@ -0,0 +1,3 @@
package SapforTestingSystem.SapforTasksPackage;
public class SapforTasksPackageTree {
}

2
src/TestingSystem/TestingServer.java
View File

@@ -396,6 +396,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//1 - архивировать пакет. //1 - архивировать пакет.
File packageArchive = SapforTasksPackageInterface.getPackageArchive(sapforTasksPackage); File packageArchive = SapforTasksPackageInterface.getPackageArchive(sapforTasksPackage);
Utils.forceDeleteWithCheck(packageArchive); Utils.forceDeleteWithCheck(packageArchive);
System.out.println("src = "+Utils.Brackets(sapforTasksPackage.workspace));
System.out.println("dst="+Utils.Brackets(packageArchive.getAbsolutePath()));
//--- //---
ZipFolderPass zip = new ZipFolderPass(); ZipFolderPass zip = new ZipFolderPass();
if (zip.Do(sapforTasksPackage.workspace, packageArchive.getAbsolutePath())) { if (zip.Do(sapforTasksPackage.workspace, packageArchive.getAbsolutePath())) {

4
src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
View File

@@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import Common.UI.UI; import Common.UI.UI;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage; import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> { public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
@Override @Override
@@ -16,6 +17,9 @@ public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforTasksPackage)) { if (Current.Check(Log, Current.SapforTasksPackage)) {
target = Current.getSapforTasksPackage(); target = Current.getSapforTasksPackage();
if (!target.state.equals(TasksPackageState.Done)) {
Log.Writeln_("Пакет не завершен!");
} else
return true; return true;
} }
return false; return false;

6
src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
View File

@@ -104,6 +104,12 @@
</component> </component>
</children> </children>
</toolbar> </toolbar>
<grid id="a1b9a" binding="treePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children> </children>
</grid> </grid>
<grid id="98e2e" layout-manager="BorderLayout" hgap="0" vgap="0"> <grid id="98e2e" layout-manager="BorderLayout" hgap="0" vgap="0">

1
src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
View File

@@ -13,6 +13,7 @@ public class SapforPackageFields implements DialogFields, FormWithSplitters {
private JButton bPrevious; private JButton bPrevious;
private JButton bNext; private JButton bNext;
private JButton bCompare; private JButton bCompare;
private JPanel treePanel;
public JPanel getContent() { public JPanel getContent() {
return content; return content;
} }