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

отображение файлов вывода (парса и преобразования)

Browse Source
This commit is contained in:
02090095
2023-11-02 23:27:38 +03:00
parent f20eec07b0
commit 6dbece2d92
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml generated
View File

@@ -8,9 +8,8 @@
<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/SapforTestingSystem/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.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" />

17
src/SapforTestingSystem/Json/SapforVersion_json.java
View File

@@ -1,4 +1,5 @@
package SapforTestingSystem.Json; package SapforTestingSystem.Json;
import Common.Constants;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
import ProjectData.Files.FileType; import ProjectData.Files.FileType;
@@ -37,7 +38,7 @@ public class SapforVersion_json implements Serializable {
//-- //--
File[] files_ = Home.listFiles(); File[] files_ = Home.listFiles();
if (files_ != null) { if (files_ != null) {
for (File file: files_){ for (File file : files_) {
if (file.isFile()) { if (file.isFile()) {
ProjectFile projectFile = new ProjectFile(file); ProjectFile projectFile = new ProjectFile(file);
if (!projectFile.fileType.equals(FileType.forbidden)) { if (!projectFile.fileType.equals(FileType.forbidden)) {
@@ -46,5 +47,19 @@ public class SapforVersion_json implements Serializable {
} }
} }
} }
//теперь файлы вывода.
Vector<File> out_files = new Vector<>();
out_files.add(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.parse_out_file).toFile());
out_files.add(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.parse_err_file).toFile());
out_files.add(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.out_file).toFile());
out_files.add(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.err_file).toFile());
//--
for (File file : out_files) {
if (file.exists()) {
// System.out.println(file.getAbsolutePath());
ProjectFile projectFile = new ProjectFile(file);
files.add(projectFile);
}
}
} }
} }

12
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
View File

@@ -11,8 +11,6 @@ public class SapforTasksPackageTree extends DataTree {
public SapforTasksPackageTree(DefaultMutableTreeNode root_in, Current current_in) { public SapforTasksPackageTree(DefaultMutableTreeNode root_in, Current current_in) {
super(root_in); super(root_in);
current = current_in; current = current_in;
// setRootVisible(false);
// CollapseAll();
} }
@Override @Override
protected int getStartLine() { protected int getStartLine() {
@@ -27,21 +25,11 @@ public class SapforTasksPackageTree extends DataTree {
} }
@Override @Override
public void SelectionAction(TreePath e) { public void SelectionAction(TreePath e) {
// System.out.println("Select " + current);
DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent(); DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent();
// Current.set(Current.ProjectNode, node);
Object o = node.getUserObject(); Object o = node.getUserObject();
if (o instanceof SapforVersion_json) { if (o instanceof SapforVersion_json) {
SapforVersion_json version = (SapforVersion_json) o; SapforVersion_json version = (SapforVersion_json) o;
Current.set(current, version); Current.set(current, version);
/*
System.out.println(version.version+" files: "+version.files.size());
for (ProjectFile file: version.files){
System.out.println(Utils.Brackets(file));
}
System.out.println("---");
*/
if (current.equals(Current.SapforEtalonVersion)) if (current.equals(Current.SapforEtalonVersion))
UI.getMainWindow().getTestingWindow().ShowCurrentSapforPackageVersionEtalon(); UI.getMainWindow().getTestingWindow().ShowCurrentSapforPackageVersionEtalon();
else else