no message
This commit is contained in:
13
.idea/workspace.xml
generated
13
.idea/workspace.xml
generated
@@ -7,10 +7,15 @@
|
|||||||
</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/ConfigurationDescription.java" afterDir="false" />
|
<change afterPath="$PROJECT_DIR$/src/icons/versions/BadVersion.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/Common/UI/Trees/TreeRenderers.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Trees/TreeRenderers.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/PackageVersionsTree.java" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/PackageVersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforVersionsTreeCellRenderer.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/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/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.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" />
|
||||||
@@ -88,7 +93,7 @@
|
|||||||
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
|
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
|
||||||
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
|
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
|
||||||
<property name="extract.method.default.visibility" value="public" />
|
<property name="extract.method.default.visibility" value="public" />
|
||||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons" />
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/versions" />
|
||||||
<property name="project.structure.last.edited" value="Artifacts" />
|
<property name="project.structure.last.edited" value="Artifacts" />
|
||||||
<property name="project.structure.proportion" value="0.15" />
|
<property name="project.structure.proportion" value="0.15" />
|
||||||
<property name="project.structure.side.proportion" value="0.2" />
|
<property name="project.structure.side.proportion" value="0.2" />
|
||||||
@@ -101,11 +106,11 @@
|
|||||||
<recent name="controls.Trees" />
|
<recent name="controls.Trees" />
|
||||||
</key>
|
</key>
|
||||||
<key name="CopyFile.RECENT_KEYS">
|
<key name="CopyFile.RECENT_KEYS">
|
||||||
|
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
|
||||||
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
|
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
|
||||||
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons" />
|
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons" />
|
||||||
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Transformations" />
|
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Transformations" />
|
||||||
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Editor" />
|
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Editor" />
|
||||||
<recent name="C:\Users\misha\Documents\visual_dvm_2020\src\files\Planner" />
|
|
||||||
</key>
|
</key>
|
||||||
<key name="MoveMembersDialog.RECENTS_KEY">
|
<key name="MoveMembersDialog.RECENTS_KEY">
|
||||||
<recent name="Common.Constants" />
|
<recent name="Common.Constants" />
|
||||||
|
|||||||
@@ -8,6 +8,6 @@ public enum TreeRenderers {
|
|||||||
RendererVersion,
|
RendererVersion,
|
||||||
RendererRule,
|
RendererRule,
|
||||||
RendererAttachment,
|
RendererAttachment,
|
||||||
RendererPackageVersion,
|
RendererSapforVersion,
|
||||||
RendererSelection
|
RendererSelection,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ import GlobalData.Tasks.RunTask.RunTasksDBTable;
|
|||||||
import GlobalData.User.UsersDBTable;
|
import GlobalData.User.UsersDBTable;
|
||||||
import ProjectData.DBArray.ArraysDBTable;
|
import ProjectData.DBArray.ArraysDBTable;
|
||||||
import ProjectData.Files.UI.FilesTreeCellRenderer;
|
import ProjectData.Files.UI.FilesTreeCellRenderer;
|
||||||
import ProjectData.Project.UI.PackageVersionsTreeCellRenderer;
|
import SapforTestingSystem.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
|
||||||
import ProjectData.Project.UI.VersionsTreeCellRenderer;
|
import ProjectData.Project.UI.VersionsTreeCellRenderer;
|
||||||
import ProjectData.SapforData.Arrays.ArraysSet;
|
import ProjectData.SapforData.Arrays.ArraysSet;
|
||||||
import ProjectData.SapforData.Arrays.UI.DimensionRenderer;
|
import ProjectData.SapforData.Arrays.UI.DimensionRenderer;
|
||||||
@@ -315,7 +315,7 @@ public class UI {
|
|||||||
TreeRenderers.put(RendererRemoteFile, new RemoteFileRenderer());
|
TreeRenderers.put(RendererRemoteFile, new RemoteFileRenderer());
|
||||||
TreeRenderers.put(RendererFile, new FilesTreeCellRenderer());
|
TreeRenderers.put(RendererFile, new FilesTreeCellRenderer());
|
||||||
TreeRenderers.put(RendererVersion, new VersionsTreeCellRenderer());
|
TreeRenderers.put(RendererVersion, new VersionsTreeCellRenderer());
|
||||||
TreeRenderers.put(RendererPackageVersion, new PackageVersionsTreeCellRenderer());
|
TreeRenderers.put(RendererSapforVersion, new SapforVersionsTreeCellRenderer());
|
||||||
TreeRenderers.put(RendererRule, new RulesTreeCellRenderer());
|
TreeRenderers.put(RendererRule, new RulesTreeCellRenderer());
|
||||||
TreeRenderers.put(RendererSelection, new SelectionTreeCellRenderer());
|
TreeRenderers.put(RendererSelection, new SelectionTreeCellRenderer());
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
|
|||||||
@@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -15,6 +15,7 @@ public class SapforVersion_json implements Serializable {
|
|||||||
public String version = "";
|
public String version = "";
|
||||||
@Expose
|
@Expose
|
||||||
public String description = "";
|
public String description = "";
|
||||||
|
public boolean success = true;
|
||||||
//поля для отображения деревьев.
|
//поля для отображения деревьев.
|
||||||
public File Home = null;
|
public File Home = null;
|
||||||
public Vector<ProjectFile> files = null;
|
public Vector<ProjectFile> files = null;
|
||||||
|
|||||||
@@ -57,8 +57,10 @@ public class SapforTask extends DBObject {
|
|||||||
DefaultMutableTreeNode child = null;
|
DefaultMutableTreeNode child = null;
|
||||||
DefaultMutableTreeNode parent = null;
|
DefaultMutableTreeNode parent = null;
|
||||||
//--
|
//--
|
||||||
|
|
||||||
for (SapforVersion_json version_json : versions) {
|
for (SapforVersion_json version_json : versions) {
|
||||||
version_json.init(configurationRoot);
|
version_json.init(configurationRoot);
|
||||||
|
//-
|
||||||
child = new DefaultMutableTreeNode(version_json);
|
child = new DefaultMutableTreeNode(version_json);
|
||||||
if (parent == null) {
|
if (parent == null) {
|
||||||
root = child;
|
root = child;
|
||||||
@@ -67,8 +69,10 @@ public class SapforTask extends DBObject {
|
|||||||
parent.add(child);
|
parent.add(child);
|
||||||
parent = child;
|
parent = child;
|
||||||
}
|
}
|
||||||
|
//-
|
||||||
}
|
}
|
||||||
if (parent != null) {
|
if (parent != null) {
|
||||||
|
|
||||||
for (SapforVersion_json version_json : variants) {
|
for (SapforVersion_json version_json : variants) {
|
||||||
version_json.init(configurationRoot);
|
version_json.init(configurationRoot);
|
||||||
parent.add(new DefaultMutableTreeNode(version_json));
|
parent.add(new DefaultMutableTreeNode(version_json));
|
||||||
|
|||||||
@@ -19,6 +19,12 @@ public class SapforTasksPackageTree extends DataTree {
|
|||||||
@Override
|
@Override
|
||||||
public void LeftMouseAction2() {
|
public void LeftMouseAction2() {
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
@Override
|
||||||
|
public TreeRenderers getRenderer() {
|
||||||
|
return TreeRenderers.RendererSapforVersion;
|
||||||
|
}
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Current getCurrent() {
|
public Current getCurrent() {
|
||||||
return current;
|
return current;
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package ProjectData.Project.UI;
|
package SapforTestingSystem.SapforTasksPackage.UI;
|
||||||
import Common.UI.Trees.StyledTreeCellRenderer;
|
import Common.UI.Trees.StyledTreeCellRenderer;
|
||||||
import ProjectData.Project.db_project_info;
|
import SapforTestingSystem.Json.SapforVersion_json;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import javax.swing.tree.DefaultMutableTreeNode;
|
import javax.swing.tree.DefaultMutableTreeNode;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
public class PackageVersionsTreeCellRenderer 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,
|
||||||
boolean selected, boolean expanded,
|
boolean selected, boolean expanded,
|
||||||
@@ -13,28 +13,17 @@ public class PackageVersionsTreeCellRenderer extends StyledTreeCellRenderer {
|
|||||||
super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
|
super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
|
||||||
URL imageUrl = null;
|
URL imageUrl = null;
|
||||||
Object o = ((DefaultMutableTreeNode) value).getUserObject();
|
Object o = ((DefaultMutableTreeNode) value).getUserObject();
|
||||||
if (o instanceof db_project_info) {
|
if (o instanceof SapforVersion_json) {
|
||||||
/*
|
SapforVersion_json version_json = (SapforVersion_json) o;
|
||||||
db_project_info version = (db_project_info) o;
|
setForeground(tree.getForeground());
|
||||||
String type_image_key = "";
|
setFont(getFont().deriveFont((float) 14.0));
|
||||||
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";
|
|
||||||
imageUrl = getClass().getResource("/icons/versions/" +
|
imageUrl = getClass().getResource("/icons/versions/" +
|
||||||
type_image_key +
|
(version_json.success ? "Version" : "BadVersion") +
|
||||||
".png");
|
".png");
|
||||||
if (imageUrl != null) {
|
if (imageUrl != null) {
|
||||||
setIcon(new ImageIcon(imageUrl));
|
setIcon(new ImageIcon(imageUrl));
|
||||||
}
|
}
|
||||||
setForeground(tree.getForeground());
|
} else {
|
||||||
setFont(getFont().deriveFont((float) 14.0));
|
|
||||||
setText(version.getTitle());
|
|
||||||
|
|
||||||
*/
|
|
||||||
}else {
|
|
||||||
setForeground(tree.getForeground());
|
setForeground(tree.getForeground());
|
||||||
setFont(getFont().deriveFont((float) 14.0));
|
setFont(getFont().deriveFont((float) 14.0));
|
||||||
}
|
}
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 857 B |
BIN
src/icons/versions/BadVersion.png
Normal file
BIN
src/icons/versions/BadVersion.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 857 B |
Reference in New Issue
Block a user