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

упраздение лишних енумов в оформлении таблиц и деревьев.

Browse Source
This commit is contained in:
02090095
2024-10-15 15:13:57 +03:00
parent b7b82e54c6
commit 5e2a9848da
146 changed files with 565 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -27,6 +27,9 @@ import java.awt.event.KeyEvent;
import java.util.Vector;
public class SPFEditor extends BaseEditor implements SPFEditorInterface {
public static final Color never = new Color(229, 228, 226, 90);
//--
public static final Highlighter.HighlightPainter GreenTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
public static final Highlighter.HighlightPainter RedTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
public DBProjectFile file = null; //файл связанный с редактором
//----
public RSyntaxTextAreaHighlighter highlighter = null;

6
src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import Common.Visual.Trees.GraphTreeCellRenderer;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject;
@@ -13,8 +13,8 @@ public class FileGraphTree extends DataTree {
// ExpandAll();
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererGraph;
public Class getRendererClass() {
return GraphTreeCellRenderer.class;
}
@Override
public Current getCurrent() {

5
src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.DragDrop.FileDrop;
import Common.Visual.Trees.StyledTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -54,8 +53,8 @@ public class FilesTree extends StyledTree {
file_pass : folder_pass).Do();
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererFile;
public Class getRendererClass() {
return FilesTreeCellRenderer.class;
}
@Override
protected GraphMenu createMenu() {

4
src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
View File

@@ -3,7 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.ColumnFilter;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Global;
import javax.swing.table.TableModel;
@@ -29,7 +29,7 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setMinWidth(700);
columns.get(3).setRenderer(TableRenderers.RendererWrapText);
columns.get(3).setRendererClass(RendererWrapText.class);
}
@Override
public void MouseAction2() throws Exception {

4
src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.Messages.Recommendations;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -19,7 +19,7 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(1).setMinWidth(700);
columns.get(1).setRenderer(TableRenderers.RendererWrapText);
columns.get(1).setRendererClass(RendererWrapText.class);
}
};
}

2
src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java → src/_VisualDVM/ProjectData/Project/UI/RendererProjectVersion.java
View File

@@ -11,7 +11,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
import java.net.URL;
//https://docs.oracle.com/javase/7/docs/api/javax/swing/tree/DefaultMutableTreeNode.html
//https://java.hotexamples.com/ru/examples/java.awt/JTree/-/java-jtree-class-examples.html
public class VersionsTreeCellRenderer extends StyledTreeCellRenderer {
public class RendererProjectVersion extends StyledTreeCellRenderer {
public java.awt.Component getTreeCellRendererComponent(
JTree tree, Object value,
boolean selected, boolean expanded,

5
src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.Project.UI;
import Common.Visual.Selectable;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -31,8 +30,8 @@ public class VersionsTree extends DataTree {
});
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererVersion;
public Class getRendererClass() {
return RendererProjectVersion.class;
}
@Override
public Current getCurrent() {

4
src/_VisualDVM/ProjectData/Project/db_project_info.java
View File

@@ -5,7 +5,7 @@ import Common.Passes.PassException;
import Common.Utils.Index;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -1171,7 +1171,7 @@ public class db_project_info extends DBObject {
String[] localSplit = splited[idx++].split(" ");
int m_type = Integer.parseInt(localSplit[0]);
if (m_type == 1) {
UI_.Info(packed_messages);
UI.Info(packed_messages);
return true;
}
}

12
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -1,16 +1,16 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererHiddenList;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Tables.EditorFilesHyperlinks;
import _VisualDVM.Visual.Tables.RendererHyperlinks;
import java.util.Vector;
import static Common.Visual.Tables.TableEditors.EditorHyperlinks;
import static Common.Visual.Tables.TableRenderers.RendererHiddenList;
import static Common.Visual.Tables.TableRenderers.RendererHyperlinks;
public class ArraysSet extends DataSet<Long, ProjectArray> {
public ArraysSet() {
super(Long.class, ProjectArray.class);
@@ -38,10 +38,10 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
columns.get(4).setRenderer(RendererHyperlinks);
columns.get(4).setEditor(EditorHyperlinks);
columns.get(4).setRendererClass(RendererHyperlinks.class);
columns.get(4).setEditorClass(EditorFilesHyperlinks.class);
} else {
columns.get(4).setRenderer(RendererHiddenList);
columns.get(4).setRendererClass(RendererHiddenList.class);
columns.get(4).setMaxWidth(200);
}
}

4
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.Tables.EditorDBObject;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import javax.swing.*;
public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {
public class DimensionStateChanger extends EditorDBObject<TemplateDimension> {
@Override
public Object getCellEditorValue() {
return value;

11
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
View File

@@ -3,16 +3,13 @@ import Common.MainModule_;
import Common.Visual.ControlForm;
import Common.Visual.Tables.Grid.GridAnchestor;
import Common.Visual.Tables.StyledTable;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import java.awt.*;
import java.util.Vector;
import static Common.Visual.Tables.TableEditors.EditorDimension;
import static Common.Visual.Tables.TableRenderers.RendererDimension;
public class DimensionsTableForm extends ControlForm<StyledTable> {
public DimensionsTableForm() {
super(StyledTable.class);
@@ -26,7 +23,7 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
@Override
public void Clear() {
super.Clear();
UI_.Clear(content);
UI.Clear(content);
}
@Override
public void CreateControl() {
@@ -48,8 +45,8 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
}) {
@Override
public void Init() {
setDefaultRenderer(TemplateDimension.class, MainModule_.instance.getUI().getTableRenderer(RendererDimension));
setDefaultEditor(TemplateDimension.class, MainModule_.instance.getUI().getTableEditor(EditorDimension));
setDefaultRenderer(TemplateDimension.class, MainModule_.instance.getUI().getTableRenderer(DimensionRenderer.class));
setDefaultEditor(TemplateDimension.class, MainModule_.instance.getUI().getTableEditor(DimensionStateChanger.class));
}
};
}

2
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java → src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RendererTreeRule.java
View File

@@ -6,7 +6,7 @@ import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
public class RulesTreeCellRenderer extends StyledTreeCellRenderer {
public class RendererTreeRule extends StyledTreeCellRenderer {
public java.awt.Component getTreeCellRendererComponent(
JTree tree, Object value,
boolean selected, boolean expanded,

6
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.Trees.StyledTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
@@ -9,7 +8,6 @@ import _VisualDVM.Visual.Menus.GraphMenu;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
import static Common.Visual.Trees.TreeRenderers.RendererRule;
public class RulesTree extends StyledTree {
public RulesTree() {
super(Global.mainModule.getProject().align_rules_root);
@@ -23,8 +21,8 @@ public class RulesTree extends StyledTree {
return new DistributionMenu(this);
}
@Override
public TreeRenderers getRenderer() {
return RendererRule;
public Class getRendererClass() {
return RendererTreeRule.class;
}
@Override
public void SelectionAction(TreePath e) {

4
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -32,7 +32,7 @@ public class FuncCall extends FileObjectWithMessages {
if (Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
UI.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
}
}
}

4
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -41,7 +41,7 @@ public class FuncCallH extends FuncCall {
if (Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
UI.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
}
}
}

4
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Visual.ControlForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import com.mxgraph.swing.mxGraphComponent;
@@ -22,6 +22,6 @@ public class FunctionsGraphForm extends ControlForm<mxGraphComponent> {
@Override
public void Clear() {
super.Clear();
UI_.Clear(content);
UI.Clear(content);
}
}

4
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions;
@@ -242,7 +242,7 @@ public class FunctionsGraphUI extends mxGraph {
break;
case Standard:
case NotFound:
UI_.Info("процедура " + Utils_.Brackets(func_name) + " " + fi.type.getDescription());
UI.Info("процедура " + Utils_.Brackets(func_name) + " " + fi.type.getDescription());
break;
}
break;

6
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.TreeRenderers;
import Common.Visual.Trees.SelectionTreeCellRenderer;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject;
@@ -10,8 +10,8 @@ public class InlineTree extends SelectableTree {
super(Global.mainModule.getProject().inline_root);
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererSelection;
public Class getRendererClass() {
return SelectionTreeCellRenderer.class;
}
@Override
public Current getCurrent() {

6
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.TreeRenderers;
import Common.Visual.Trees.SelectionTreeCellRenderer;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject;
@@ -10,8 +10,8 @@ public class InlineTree2 extends SelectableTree {
super(Global.mainModule.getProject().inline_root2);
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererSelection;
public Class getRendererClass() {
return SelectionTreeCellRenderer.class;
}
@Override
public Current getCurrent() {

6
src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Includes.UI;
import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.TreeRenderers;
import Common.Visual.Trees.SelectionTreeCellRenderer;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.GraphMenu;
@@ -13,8 +13,8 @@ public class IncludesTree extends SelectableTree {
return Current.IncludeGraphElement;
}
@Override
public TreeRenderers getRenderer() {
return TreeRenderers.RendererSelection;
public Class getRendererClass() {
return SelectionTreeCellRenderer.class;
}
@Override
protected GraphMenu createMenu() {

6
src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Loops;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import javax.swing.text.Highlighter;
public enum LoopState {
@@ -29,9 +29,9 @@ public enum LoopState {
public Highlighter.HighlightPainter getPainter() {
switch (this) {
case GoodLoop:
return UI_.GreenTextPainter;
return SPFEditor.GreenTextPainter;
case BadLoop:
return UI_.RedTextPainter;
return SPFEditor.RedTextPainter;
default:
return null;
}

9
src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
View File

@@ -1,12 +1,11 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.Current;
import java.math.BigInteger;
import static Common.Visual.Tables.TableRenderers.RendererMultiline;
import static Common.Visual.Tables.TableRenderers.RendererTopLeft;
public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
//суррогат. нужен только для сохры столбцов. во всяком случае пока.
public RegionsSet() {
@@ -31,8 +30,8 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
for (int i = 1; i < 7; ++i)
columns.get(i).setRenderer(RendererTopLeft);
columns.get(7).setRenderer(RendererMultiline);
columns.get(i).setRendererClass(RendererTopLeft.class);
columns.get(7).setRendererClass(RendererMultiline.class);
}
};
}

8
src/_VisualDVM/ProjectData/SapforData/Variants/UI/RendererVariantRank.java Normal file
View File

@@ -0,0 +1,8 @@
package _VisualDVM.ProjectData.SapforData.Variants.UI;
import Common.Visual.Tables.RendererMaskedNanInteger;
public class RendererVariantRank extends RendererMaskedNanInteger {
@Override
public long getMask() {
return 1;
}
}

8
src/_VisualDVM/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java
View File

@@ -1,8 +0,0 @@
package _VisualDVM.ProjectData.SapforData.Variants.UI;
import Common.Visual.Tables.MaskedIntegerValueRenderer;
public class VariantRankRenderer extends MaskedIntegerValueRenderer {
@Override
public long getMask() {
return 1;
}
}

13
src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java
View File

@@ -1,10 +1,13 @@
package _VisualDVM.ProjectData.SapforData.Variants;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.SapforData.Variants.UI.RendererVariantRank;
import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
import static Common.Visual.Tables.TableRenderers.*;
public class VariantsSet extends DataSet<String, ParallelVariant> {
public VariantsSet() {
super(String.class, ParallelVariant.class);
@@ -23,11 +26,11 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(2).setRenderer(RendererMultiline);
columns.get(2).setRendererClass(RendererMultiline.class);
for (int i = 3; i < columns.size() - 3; ++i)
columns.get(i).setRenderer(RendererMaskedInt);
columns.get(columns.size() - 3).setRenderer(RendererVariantRank);
columns.get(columns.size() - 2).setRenderer(RendererDate);
columns.get(i).setRendererClass(RendererMaskedNanInteger.class);
columns.get(columns.size() - 3).setRendererClass( RendererVariantRank.class);
columns.get(columns.size() - 2).setRendererClass(RendererDate.class);
}
};
}