no message
This commit is contained in:
5
.idea/workspace.xml
generated
5
.idea/workspace.xml
generated
@@ -7,8 +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/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.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/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/PackageVersionsComparisonForm.java" beforeDir="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" />
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import Common.Database.DBObject;
|
|||||||
import Common.Database.nDBObject;
|
import Common.Database.nDBObject;
|
||||||
import TestingSystem.TasksPackage.TasksPackageState;
|
import TestingSystem.TasksPackage.TasksPackageState;
|
||||||
import com.sun.org.glassfish.gmbal.Description;
|
import com.sun.org.glassfish.gmbal.Description;
|
||||||
|
|
||||||
|
import javax.swing.tree.DefaultMutableTreeNode;
|
||||||
public class SapforTasksPackage extends nDBObject {
|
public class SapforTasksPackage extends nDBObject {
|
||||||
@Description("DEFAULT ''")
|
@Description("DEFAULT ''")
|
||||||
public String testsNames = "";//имена тестов через ; для отображения
|
public String testsNames = "";//имена тестов через ; для отображения
|
||||||
@@ -25,7 +27,6 @@ public class SapforTasksPackage extends nDBObject {
|
|||||||
public int kernels = 1; //количество потоков.
|
public int kernels = 1; //количество потоков.
|
||||||
@Description("DEFAULT 'TestsSynchronize'")
|
@Description("DEFAULT 'TestsSynchronize'")
|
||||||
public TasksPackageState state = TasksPackageState.TestsSynchronize;
|
public TasksPackageState state = TasksPackageState.TestsSynchronize;
|
||||||
|
|
||||||
@Description("DEFAULT ''")
|
@Description("DEFAULT ''")
|
||||||
public String testsIds = "";
|
public String testsIds = "";
|
||||||
@Description("DEFAULT ''")
|
@Description("DEFAULT ''")
|
||||||
@@ -38,6 +39,8 @@ public class SapforTasksPackage extends nDBObject {
|
|||||||
//RunningExecution
|
//RunningExecution
|
||||||
//Done
|
//Done
|
||||||
//Aborted
|
//Aborted
|
||||||
|
@Description("IGNORE")
|
||||||
|
public DefaultMutableTreeNode root = null;
|
||||||
@Override
|
@Override
|
||||||
public void SynchronizeFields(DBObject src) {
|
public void SynchronizeFields(DBObject src) {
|
||||||
super.SynchronizeFields(src);
|
super.SynchronizeFields(src);
|
||||||
|
|||||||
@@ -16,7 +16,27 @@ public class SapforTasksPackageInterface {
|
|||||||
public static File getPackageArchive(SapforTasksPackage package_in) {
|
public static File getPackageArchive(SapforTasksPackage package_in) {
|
||||||
return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
|
return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
|
||||||
}
|
}
|
||||||
public static DefaultMutableTreeNode getTreeRoot(SapforTasksPackage package_in) {
|
public static SapforTasksResults_json getLocalResults(SapforTasksPackage package_in) {
|
||||||
|
File json_file = new File(getLocalWorkspace(package_in), Constants.results_json);
|
||||||
|
SapforTasksResults_json res = null;
|
||||||
|
try {
|
||||||
|
res = (SapforTasksResults_json) Utils.jsonFromFile(json_file,
|
||||||
|
SapforTasksResults_json.class);
|
||||||
|
} catch (Exception ex) {
|
||||||
|
ex.printStackTrace();
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
public static File getLocalWorkspace(SapforTasksPackage package_in) {
|
||||||
|
return new File(Global.SapforPackagesDirectory, package_in.id);
|
||||||
|
}
|
||||||
|
public static File getLoadedSign(SapforTasksPackage package_in) {
|
||||||
|
return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), package_in.id, Constants.LOADED).toFile();
|
||||||
|
}
|
||||||
|
public static boolean isLoaded(SapforTasksPackage package_in) {
|
||||||
|
return getLoadedSign(package_in).exists();
|
||||||
|
}
|
||||||
|
public static DefaultMutableTreeNode buildTree(SapforTasksPackage package_in) {
|
||||||
SapforTasksResults_json results_json = getLocalResults(package_in);
|
SapforTasksResults_json results_json = getLocalResults(package_in);
|
||||||
//-- флаги группы
|
//-- флаги группы
|
||||||
LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.sortTasksByStatesConfigurationsAndGroups();
|
LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.sortTasksByStatesConfigurationsAndGroups();
|
||||||
@@ -53,24 +73,9 @@ public class SapforTasksPackageInterface {
|
|||||||
}
|
}
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
public static File getLocalWorkspace(SapforTasksPackage package_in) {
|
public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) {
|
||||||
return new File(Global.SapforPackagesDirectory, package_in.id);
|
if (package_in.root == null)
|
||||||
}
|
package_in.root = buildTree(package_in);
|
||||||
public static SapforTasksResults_json getLocalResults(SapforTasksPackage package_in) {
|
return package_in.root;
|
||||||
File json_file = new File(getLocalWorkspace(package_in), Constants.results_json);
|
|
||||||
SapforTasksResults_json res = null;
|
|
||||||
try {
|
|
||||||
res = (SapforTasksResults_json) Utils.jsonFromFile(json_file,
|
|
||||||
SapforTasksResults_json.class);
|
|
||||||
} catch (Exception ex) {
|
|
||||||
ex.printStackTrace();
|
|
||||||
}
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
public static File getLoadedSign(SapforTasksPackage package_in) {
|
|
||||||
return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), package_in.id, Constants.LOADED).toFile();
|
|
||||||
}
|
|
||||||
public static boolean isLoaded(SapforTasksPackage package_in) {
|
|
||||||
return getLoadedSign(package_in).exists();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package SapforTestingSystem.SapforTasksPackage.UI;
|
||||||
|
import GlobalData.Tasks.TaskState;
|
||||||
|
public class StateSummary extends TreeSummary{
|
||||||
|
public TaskState state;
|
||||||
|
public int count = 0;
|
||||||
|
public StateSummary(TaskState state_in){
|
||||||
|
state = state_in;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void refreshText(){
|
||||||
|
text = state.getDescription()+" : "+count;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package SapforTestingSystem.SapforTasksPackage.UI;
|
||||||
|
public abstract class TreeSummary {
|
||||||
|
public String text="";
|
||||||
|
public abstract void refreshText();
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return text;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
package Visual_DVM_2021.UI.Main;
|
|
||||||
import Common.Current;
|
|
||||||
public class PackageVersionsComparisonForm extends VersionsComparisonForm{
|
|
||||||
public PackageVersionsComparisonForm(PackageVersionsComparisonForm slave_in) {
|
|
||||||
super(slave_in);
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected Current getCurrentObjectName() {
|
|
||||||
return Current.PackageVersion;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -90,7 +90,13 @@ public class SapforPackagesComparisonForm {
|
|||||||
protected void showObject() {
|
protected void showObject() {
|
||||||
lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : ""));
|
lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : ""));
|
||||||
lObjectName.setToolTipText(object.getPK().toString());
|
lObjectName.setToolTipText(object.getPK().toString());
|
||||||
treePanel.add(new JScrollPane(new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(object),
|
treePanel.add(new JScrollPane(
|
||||||
|
new SapforTasksPackageTree(
|
||||||
|
|
||||||
|
|
||||||
|
SapforTasksPackageInterface.buildTree(object),
|
||||||
|
|
||||||
|
|
||||||
isMaster()? Current.SapforEtalonVersion: Current.SapforVersion
|
isMaster()? Current.SapforEtalonVersion: Current.SapforVersion
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user