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

no message

Browse Source
This commit is contained in:
02090095
2023-10-31 01:51:08 +03:00
parent 01dfc667fc
commit 57758c5597
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -7,14 +7,8 @@
</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/ProjectData/Files/ProjectFile.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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" 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/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.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/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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

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

@@ -1,8 +1,8 @@
package SapforTestingSystem.Json; package SapforTestingSystem.Json;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileType; import ProjectData.Files.FileType;
import ProjectData.Files.ProjectFile;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import java.io.File; import java.io.File;
@@ -16,7 +16,7 @@ public class SapforVersion_json implements Serializable {
public String description = ""; public String description = "";
//поля для отображения деревьев. //поля для отображения деревьев.
public File Home = null; public File Home = null;
public Vector<DBProjectFile> files = null; public Vector<ProjectFile> files = null;
//- //-
public SapforVersion_json(String version_in, String description_in) { public SapforVersion_json(String version_in, String description_in) {
version = version_in; version = version_in;
@@ -39,11 +39,9 @@ public class SapforVersion_json implements Serializable {
if (files_ != null) { if (files_ != null) {
for (File file: files_){ for (File file: files_){
if (file.isFile()) { if (file.isFile()) {
DBProjectFile dbProjectFile = new DBProjectFile(); ProjectFile projectFile = new ProjectFile(file);
dbProjectFile.file = file; if (!projectFile.fileType.equals(FileType.forbidden)) {
dbProjectFile.AutoDetectProperties(); files.add(projectFile);
if (dbProjectFile.fileType.equals(FileType.forbidden)) {
files.add(dbProjectFile);
} }
} }
} }

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

@@ -1,6 +1,8 @@
package SapforTestingSystem.SapforTasksPackage; package SapforTestingSystem.SapforTasksPackage;
import Common.Current; import Common.Current;
import Common.UI.Trees.DataTree; import Common.UI.Trees.DataTree;
import Common.Utils.Utils;
import ProjectData.Files.ProjectFile;
import SapforTestingSystem.Json.SapforVersion_json; import SapforTestingSystem.Json.SapforVersion_json;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
@@ -31,8 +33,15 @@ public class SapforTasksPackageTree extends DataTree {
// Current.set(Current.ProjectNode, node); // Current.set(Current.ProjectNode, node);
Object o = node.getUserObject(); Object o = node.getUserObject();
if (o instanceof SapforVersion_json) { if (o instanceof SapforVersion_json) {
Current.set(current, o); SapforVersion_json version = (SapforVersion_json) o;
System.out.println(((SapforVersion_json)o).Home); 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("---");
} }
} }
} }