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-12-25 17:55:15 +03:00
parent e5f3230c9c
commit 0370573269
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -8,9 +8,9 @@
<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 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/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.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" />

15
src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
View File

@@ -7,8 +7,8 @@ import TestingSystem.SAPFOR.SapforTasksPackage.UI.*;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
import java.io.Serializable; import java.io.Serializable;
import java.nio.file.Paths;
import java.util.Comparator; import java.util.Comparator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
@@ -133,6 +133,7 @@ public class SapforPackage_json implements Serializable {
} }
} }
} }
//---------------------------------------------------->>
public void buildTree(SapforPackage package_in) { public void buildTree(SapforPackage package_in) {
root = new PackageSummary(); root = new PackageSummary();
//--- //---
@@ -159,7 +160,11 @@ public class SapforPackage_json implements Serializable {
configurationNode = new ConfigurationSummary(configuration_id, task); configurationNode = new ConfigurationSummary(configuration_id, task);
} }
//-- //--
groupSummary.add(task.getVersionsTree(new File(package_in.getLocalWorkspace(), String.valueOf(configuration_id)))); groupSummary.add(task.getVersionsTree(
Paths.get(package_in.getLocalWorkspace().getAbsolutePath(),
String.valueOf(task.set_id),
String.valueOf(configuration_id)).toFile())
);
} }
if (configurationNode != null) if (configurationNode != null)
configurationNode.add(groupSummary); configurationNode.add(groupSummary);
@@ -203,7 +208,11 @@ public class SapforPackage_json implements Serializable {
configurationNode = new ConfigurationSummary(configuration_id, task); configurationNode = new ConfigurationSummary(configuration_id, task);
} }
//-- //--
groupSummary.add(task.getVersionsTree(new File(package_in.getLocalWorkspace(), String.valueOf(configuration_id)))); groupSummary.add(task.getVersionsTree(
Paths.get(package_in.getLocalWorkspace().getAbsolutePath(),
String.valueOf(task.set_id),
String.valueOf(configuration_id)).toFile())
);
} }
if (configurationNode != null) if (configurationNode != null)
configurationNode.add(groupSummary); configurationNode.add(groupSummary);

4
src/TestingSystem/SAPFOR/PerformSapforTask.java
View File

@@ -49,7 +49,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
String.valueOf(set_json.id), String.valueOf(set_json.id),
String.valueOf(configuration_json.id), String.valueOf(configuration_json.id),
target.test_description).toFile(); target.test_description).toFile();
root = new File(Global.Home, String.valueOf(configuration_json.id)); root = Paths.get(Global.Home, String.valueOf(set_json.id), String.valueOf(configuration_json.id)).toFile();
task = null; task = null;
//--->> //--->>
return true; return true;
@@ -114,7 +114,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
target.StartDate = new Date().getTime(); target.StartDate = new Date().getTime();
target.versions.add(version_json = new SapforVersion_json(target.test_description, "")); target.versions.add(version_json = new SapforVersion_json(target.test_description, "исходная"));
for (PassCode_2021 code : configuration_json.codes) { for (PassCode_2021 code : configuration_json.codes) {
if (parse()) { if (parse()) {
if (code.equals(PassCode_2021.CreateParallelVariants)) if (code.equals(PassCode_2021.CreateParallelVariants))

1
src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
View File

@@ -77,6 +77,7 @@ public class SapforTask extends DBObject {
//-- //--
for (SapforVersion_json version_json : versions) { for (SapforVersion_json version_json : versions) {
version_json.task = this; version_json.task = this;
// System.out.println(version_json.version);
//- //-
child = new VersionSummary(version_json, version_json.init(configurationRoot)); child = new VersionSummary(version_json, version_json.init(configurationRoot));
if (parent == null) { if (parent == null) {