no message
This commit is contained in:
7
.idea/workspace.xml
generated
7
.idea/workspace.xml
generated
@@ -7,12 +7,11 @@
|
|||||||
</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/ConfigurationSummary.java" afterDir="false" />
|
<change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TestVersionSummary.java" afterDir="false" />
|
||||||
<change afterPath="$PROJECT_DIR$/src/icons/versions/Configuration.png" afterDir="false" />
|
<change afterPath="$PROJECT_DIR$/src/icons/versions/TestVersion.png" 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/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.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/SapforTestingSystem/SapforTasksPackage/UI/ConfigurationDescription.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.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" />
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import GlobalData.Tasks.TaskState;
|
|||||||
import SapforTestingSystem.Json.SapforTasksResults_json;
|
import SapforTestingSystem.Json.SapforTasksResults_json;
|
||||||
import SapforTestingSystem.SapforTask.SapforTask;
|
import SapforTestingSystem.SapforTask.SapforTask;
|
||||||
import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationSummary;
|
import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationSummary;
|
||||||
|
import SapforTestingSystem.SapforTasksPackage.UI.GroupSummary;
|
||||||
import SapforTestingSystem.SapforTasksPackage.UI.StateSummary;
|
import SapforTestingSystem.SapforTasksPackage.UI.StateSummary;
|
||||||
|
|
||||||
import javax.swing.tree.DefaultMutableTreeNode;
|
import javax.swing.tree.DefaultMutableTreeNode;
|
||||||
@@ -56,7 +57,10 @@ public class SapforTasksPackageInterface {
|
|||||||
//--
|
//--
|
||||||
LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
|
LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
|
||||||
for (String group : groups_tasks.keySet()) {
|
for (String group : groups_tasks.keySet()) {
|
||||||
DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
|
//--
|
||||||
|
GroupSummary groupSummary = new GroupSummary(group);
|
||||||
|
DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(groupSummary);
|
||||||
|
//--
|
||||||
for (SapforTask task : groups_tasks.get(group)) {
|
for (SapforTask task : groups_tasks.get(group)) {
|
||||||
//--
|
//--
|
||||||
stateSummary.count++;
|
stateSummary.count++;
|
||||||
@@ -65,6 +69,7 @@ public class SapforTasksPackageInterface {
|
|||||||
configurationSummary.init(configuration_id, task);
|
configurationSummary.init(configuration_id, task);
|
||||||
//--
|
//--
|
||||||
groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
|
groupNode.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
|
||||||
|
|
||||||
}
|
}
|
||||||
configurationNode.add(groupNode);
|
configurationNode.add(groupNode);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package SapforTestingSystem.SapforTasksPackage.UI;
|
||||||
|
public class GroupSummary extends TreeSummary {
|
||||||
|
@Override
|
||||||
|
public void refreshText() {
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public String getImageKey() {
|
||||||
|
return "Group";
|
||||||
|
}
|
||||||
|
public GroupSummary(String group_name) {
|
||||||
|
text = group_name;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
package SapforTestingSystem.SapforTasksPackage.UI;
|
package SapforTestingSystem.SapforTasksPackage.UI;
|
||||||
import Common.UI.Trees.StyledTreeCellRenderer;
|
import Common.UI.Trees.StyledTreeCellRenderer;
|
||||||
|
import SapforTestingSystem.Json.SapforVersion_json;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import javax.swing.tree.DefaultMutableTreeNode;
|
import javax.swing.tree.DefaultMutableTreeNode;
|
||||||
|
import java.util.Objects;
|
||||||
public class SapforVersionsTreeCellRenderer extends StyledTreeCellRenderer {
|
public class SapforVersionsTreeCellRenderer extends StyledTreeCellRenderer {
|
||||||
public java.awt.Component getTreeCellRendererComponent(
|
public java.awt.Component getTreeCellRendererComponent(
|
||||||
JTree tree, Object value,
|
JTree tree, Object value,
|
||||||
@@ -16,14 +18,15 @@ public class SapforVersionsTreeCellRenderer extends StyledTreeCellRenderer {
|
|||||||
setFont(getFont().deriveFont((float) 14.0));
|
setFont(getFont().deriveFont((float) 14.0));
|
||||||
setIcon(summary.getIcon());
|
setIcon(summary.getIcon());
|
||||||
}
|
}
|
||||||
/*
|
else {
|
||||||
else
|
if (o instanceof SapforVersion_json){
|
||||||
|
SapforVersion_json version_json = (SapforVersion_json) o;
|
||||||
{
|
|
||||||
setForeground(tree.getForeground());
|
setForeground(tree.getForeground());
|
||||||
setFont(getFont().deriveFont((float) 14.0));
|
setFont(getFont().deriveFont((float) 14.0));
|
||||||
|
setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/versions/TestVersion.png"))));
|
||||||
|
setText(version_json.toString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
src/icons/versions/Group.png
Normal file
BIN
src/icons/versions/Group.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 968 B |
BIN
src/icons/versions/TestVersion.png
Normal file
BIN
src/icons/versions/TestVersion.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 829 B |
Reference in New Issue
Block a user