no message

This commit is contained in:
2023-11-03 02:00:17 +03:00
parent e100cf2654
commit 2f53737c56
10 changed files with 33 additions and 77 deletions

View File

@@ -8,6 +8,6 @@ public enum TreeRenderers {
RendererVersion,
RendererRule,
RendererAttachment,
RendererPackageVersion,
RendererSelection
RendererSapforVersion,
RendererSelection,
}

View File

@@ -57,7 +57,7 @@ import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable;
import ProjectData.DBArray.ArraysDBTable;
import ProjectData.Files.UI.FilesTreeCellRenderer;
import ProjectData.Project.UI.PackageVersionsTreeCellRenderer;
import SapforTestingSystem.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import ProjectData.Project.UI.VersionsTreeCellRenderer;
import ProjectData.SapforData.Arrays.ArraysSet;
import ProjectData.SapforData.Arrays.UI.DimensionRenderer;
@@ -315,7 +315,7 @@ public class UI {
TreeRenderers.put(RendererRemoteFile, new RemoteFileRenderer());
TreeRenderers.put(RendererFile, new FilesTreeCellRenderer());
TreeRenderers.put(RendererVersion, new VersionsTreeCellRenderer());
TreeRenderers.put(RendererPackageVersion, new PackageVersionsTreeCellRenderer());
TreeRenderers.put(RendererSapforVersion, new SapforVersionsTreeCellRenderer());
TreeRenderers.put(RendererRule, new RulesTreeCellRenderer());
TreeRenderers.put(RendererSelection, new SelectionTreeCellRenderer());
//----------------------------------------------

View File

@@ -1,49 +0,0 @@
package ProjectData.Project.UI;
import Common.Current;
import Common.UI.Trees.DataTree;
import Common.UI.Trees.TreeRenderers;
import Common.UI.UI;
import ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
public class PackageVersionsTree extends DataTree {
public PackageVersionsTree() {
super(null);
// Current.getSapforTasksPackage().root);
// setRootVisible(false);
ExpandAll();
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererPackageVersion;
}
@Override
public Current getCurrent() {
return Current.PackageVersion;
}
@Override
protected int getStartLine() {
return 1;
}
@Override
public void SelectionAction(TreePath path) {
DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent();
Object object = node.getUserObject();
if (object instanceof db_project_info) {
Current.set(getCurrent(), object);
}else {
Current.set(getCurrent(), null);
}
}
@Override
public void LeftMouseAction2() {
if ((Current.HasPackageVersion())&&(UI.Question("Открыть версию пакета, как текущий проект"))){
//Открываем как папку, чтобы было отдельное дерево версий, уже как для нормального проекта.
//? Запретить удалять ее (?). копировать куда то как времянку мб.
Pass_2021.passes.get(PassCode_2021.OpenCurrentProject).Do(Current.getPackageVersion().Home);
}
}
}

View File

@@ -15,6 +15,7 @@ public class SapforVersion_json implements Serializable {
public String version = "";
@Expose
public String description = "";
public boolean success = true;
//поля для отображения деревьев.
public File Home = null;
public Vector<ProjectFile> files = null;

View File

@@ -57,8 +57,10 @@ public class SapforTask extends DBObject {
DefaultMutableTreeNode child = null;
DefaultMutableTreeNode parent = null;
//--
for (SapforVersion_json version_json : versions) {
version_json.init(configurationRoot);
//-
child = new DefaultMutableTreeNode(version_json);
if (parent == null) {
root = child;
@@ -67,8 +69,10 @@ public class SapforTask extends DBObject {
parent.add(child);
parent = child;
}
//-
}
if (parent != null) {
for (SapforVersion_json version_json : variants) {
version_json.init(configurationRoot);
parent.add(new DefaultMutableTreeNode(version_json));

View File

@@ -19,6 +19,12 @@ public class SapforTasksPackageTree extends DataTree {
@Override
public void LeftMouseAction2() {
}
/*
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererSapforVersion;
}
*/
@Override
public Current getCurrent() {
return current;

View File

@@ -1,11 +1,11 @@
package ProjectData.Project.UI;
package SapforTestingSystem.SapforTasksPackage.UI;
import Common.UI.Trees.StyledTreeCellRenderer;
import ProjectData.Project.db_project_info;
import SapforTestingSystem.Json.SapforVersion_json;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import java.net.URL;
public class PackageVersionsTreeCellRenderer extends StyledTreeCellRenderer {
public class SapforVersionsTreeCellRenderer extends StyledTreeCellRenderer {
public java.awt.Component getTreeCellRendererComponent(
JTree tree, Object value,
boolean selected, boolean expanded,
@@ -13,28 +13,17 @@ public class PackageVersionsTreeCellRenderer extends StyledTreeCellRenderer {
super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
URL imageUrl = null;
Object o = ((DefaultMutableTreeNode) value).getUserObject();
if (o instanceof db_project_info) {
/*
db_project_info version = (db_project_info) o;
String type_image_key = "";
if (version.Home.getParent().equals(Current.getSapforTasksPackage().getWorkspace().getAbsolutePath()))
type_image_key = "Root";
else if (version.IsMCopy())
type_image_key = "M";
else
type_image_key = "Version";
if (o instanceof SapforVersion_json) {
SapforVersion_json version_json = (SapforVersion_json) o;
setForeground(tree.getForeground());
setFont(getFont().deriveFont((float) 14.0));
imageUrl = getClass().getResource("/icons/versions/" +
type_image_key +
(version_json.success ? "Version" : "BadVersion") +
".png");
if (imageUrl != null) {
setIcon(new ImageIcon(imageUrl));
}
setForeground(tree.getForeground());
setFont(getFont().deriveFont((float) 14.0));
setText(version.getTitle());
*/
}else {
} else {
setForeground(tree.getForeground());
setFont(getFont().deriveFont((float) 14.0));
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 857 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 857 B