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

fix.убрал из общей(в перспективе библиотечной) части ссылки на частные объекты визуализатора

Browse Source
This commit is contained in:
02090095
2024-10-16 00:40:45 +03:00
parent b79474fdd1
commit 071aab5ea6
54 changed files with 166 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/Visual/Controls/TabToolBar.java
View File

@@ -1,13 +1,13 @@
package Common.Visual.Controls;
import Common.MainModule_;
import Common.Passes.PassCode_;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
public class TabToolBar extends VisualiserMenuBar {
public TabToolBar(String titleText, PassCode... passes) {
public TabToolBar(String titleText, PassCode_... passes) {
setFloatable(false);
setOpaque(false);
//-
@@ -16,7 +16,7 @@ public class TabToolBar extends VisualiserMenuBar {
add(title);
addSeparator();
//-
for (PassCode code : passes)
for (PassCode_ code : passes)
add(MainModule_.instance.getPass(code).createTabButton());
MouseAdapter adapter = new MouseAdapter() {
@Override

30
src/Common/Visual/DataSetControlForm.java
View File

@@ -14,7 +14,6 @@ import Common.Visual.Tables.DBObjectSelectionRenderer;
import Common.Visual.Tables.DBObjectSelector;
import Common.Visual.Tables.DataTable;
import Common.Visual.Tables.Grid.GridAnchestor;
import _VisualDVM.Global;
import javax.swing.*;
import javax.swing.table.TableColumn;
@@ -64,21 +63,21 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
return getDataSource().CurrentName();
}
public void SaveColumns() {
if (Global.mainModule.getDb() != null) {
if (MainModule_.instance.getDb() != null) {
try {
if ((CurrentName() != null)) {
String tableName = CurrentName().toString();
Vector<String> widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new));
String packed = String.join("|", widths);
TableVisualData tableVisualData;
if (Global.mainModule.getDb().tablesVisualData.containsKey(tableName)) {
tableVisualData = Global.mainModule.getDb().tablesVisualData.get(tableName);
if (MainModule_.instance.getDb().tablesVisualData.containsKey(tableName)) {
tableVisualData = MainModule_.instance.getDb().tablesVisualData.get(tableName);
} else {
tableVisualData = new TableVisualData(tableName);
Global.mainModule.getDb().Insert(tableVisualData);
MainModule_.instance.getDb().Insert(tableVisualData);
}
tableVisualData.sizes = packed;
Global.mainModule.getDb().Update(tableVisualData);
MainModule_.instance.getDb().Update(tableVisualData);
}
} catch (Exception ex) {
ex.printStackTrace();
@@ -149,11 +148,11 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
//-----------------------------NEW-------------------------------------
@Override
public void CorrectColumnsSizes() {
if ((Global.mainModule.getDb() != null)
if ((MainModule_.instance.getDb() != null)
&& CurrentName() != null
&& Global.mainModule.getDb().tablesVisualData.containsKey(CurrentName().toString())) {
&& MainModule_.instance.getDb().tablesVisualData.containsKey(CurrentName().toString())) {
if (!getColumnsProfile().equalsIgnoreCase(colNamesAndSizes)) {
TableVisualData grid = Global.mainModule.getDb().tablesVisualData.get(CurrentName().toString());
TableVisualData grid = MainModule_.instance.getDb().tablesVisualData.get(CurrentName().toString());
String[] data = grid.sizes.split("\\|");
for (int i = 0; i < columns.size(); ++i) {
if (i <= (data.length - 1)) {
@@ -260,19 +259,6 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
Utils_.MainLog.PrintException(e);
}
}
//---
/*
if (hasCheckBox()) {
TableColumn column = control.getColumnModel().getColumn(1)
column.setHeaderRenderer(new TableCellRenderer() {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
return null;
}
});
}
*/
}
@Override
protected void refresh() {

4
src/Common/Visual/Menus/DataMenuBar.java
View File

@@ -1,7 +1,7 @@
package Common.Visual.Menus;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.awt.*;
@@ -14,7 +14,7 @@ public class DataMenuBar extends VisualiserMenuBar {
JButton selectAllButton = null;
JButton unselectAllButton = null;
//-
public DataMenuBar(String dataName, PassCode... passes) {
public DataMenuBar(String dataName, PassCode_... passes) {
add(new JLabel(dataName + " : "));
add(countLabel = new JLabel("?"));
addPasses(passes);

37
src/Common/Visual/Menus/GraphMenu.java Normal file
View File

@@ -0,0 +1,37 @@
package Common.Visual.Menus;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.Trees.StyledTree;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.MouseEvent;
public class GraphMenu<T extends StyledTree> extends StyledPopupMenu {
public T tree;
public GraphMenu(T tree_in, String branches_name) {
tree = tree_in;
JMenuItem m = null;
m = new VisualiserMenuItem("Свернуть все " + branches_name);
m.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
tree.CollapseAll();
}
});
add(m);
m = new VisualiserMenuItem("Развернуть все " + branches_name);
m.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
tree.ExpandAll();
}
});
add(m);
}
public GraphMenu(T tree) {
this(tree, tree.getBranchesName());
}
public void Show(MouseEvent mouseEvent) {
show(tree, mouseEvent.getX(), mouseEvent.getY());
}
}

9
src/Common/Visual/Menus/VisualiserMenuBar.java
View File

@@ -1,5 +1,6 @@
package Common.Visual.Menus;
import Common.MainModule_;
import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Global;
@@ -13,11 +14,11 @@ public class VisualiserMenuBar extends JToolBar {
setFloatable(false);
setSizeLimits();
}
public void addPasses(PassCode... codes) {
public void addPasses(PassCode_... codes) {
//- кнопки. связать их с проходами. (!)
for (PassCode code : codes) {
if (Global.mainModule.getPass(code) != null) {
add(Global.mainModule.getPass(code).createButton());
for (PassCode_ code : codes) {
if (MainModule_.instance.getPass(code) != null) {
add(MainModule_.instance.getPass(code).createButton());
}
}
}

4
src/Common/Visual/Trees/DataTree.java
View File

@@ -1,7 +1,7 @@
package Common.Visual.Trees;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.DataControl_OLD;
import _VisualDVM.Global;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
@@ -11,7 +11,7 @@ public class DataTree extends StyledTree implements DataControl_OLD {
}
public void ChangeCurrentObject(DefaultMutableTreeNode node) {
if (getCurrent() != null)
Global.mainModule.set(getCurrent(), node.getUserObject());
MainModule_.instance.set(getCurrent(), node.getUserObject());
}
@Override
public void ShowCurrentObject() throws Exception {

27
src/Common/Visual/Trees/GraphTreeCellRenderer.java
View File

@@ -1,27 +0,0 @@
package Common.Visual.Trees;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
public class GraphTreeCellRenderer extends StyledTreeCellRenderer {
public java.awt.Component getTreeCellRendererComponent(
JTree tree, Object value,
boolean selected, boolean expanded,
boolean leaf, int row, boolean hasFocus) {
super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
Object o = ((DefaultMutableTreeNode) value).getUserObject();
if (o instanceof FileObjectWithMessages) {
FileObjectWithMessages target = (FileObjectWithMessages) o;
setIcon(Utils_.getIcon(target.ImageKey()));
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(target.getFont()));
} else {
setIcon(null);
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
}
setForeground(tree.getForeground());
return this;
}
}

4
src/Common/Visual/Trees/SelectableTree.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Trees;
import Common.MainModule_;
import Common.Visual.Selectable;
import _VisualDVM.Global;
import javax.swing.tree.DefaultMutableTreeNode;
public class SelectableTree extends DataTree {
@@ -9,7 +9,7 @@ public class SelectableTree extends DataTree {
}
@Override
public void LeftMouseAction1() {
Object element = Global.mainModule.get(getCurrent());
Object element = MainModule_.instance.get(getCurrent());
if ((element instanceof Selectable)) {
((Selectable) element).SwitchSelection();
updateUI();

2
src/Common/Visual/Trees/StyledTree.java
View File

@@ -2,7 +2,7 @@ package Common.Visual.Trees;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Menus.GraphMenu;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;

10
src/Common/Visual/Windows/Dialog/Text/FileNameForm.java
View File

@@ -1,10 +0,0 @@
package Common.Visual.Windows.Dialog.Text;
import _VisualDVM.Utils;
public class FileNameForm extends TextFieldDialog {
public FileNameForm() {
}
@Override
public void validateFields() {
Utils.validateFileShortNewName(fields.getText(), Log);
}
}

25
src/Common/Visual/Windows/Dialog/Text/MultilineTextForm.java
View File

@@ -1,25 +0,0 @@
package Common.Visual.Windows.Dialog.Text;
import _VisualDVM.Visual.Editor.BaseEditor;
public class MultilineTextForm extends TextDialog<BaseEditor> {
public MultilineTextForm() {
super(BaseEditor.class);
}
//при наследовании по умолчанию поля не присваивать!
//инициализация полей работает после конструктора предка!!
@Override
public void ProcessResult() {
Result = fields.getText();
}
@Override
public void InitFields() {
fields.setSearchEnabled(false);
fields.setLineWrap(true);
fields.setWrapStyleWord(true);
fields.setHighlightCurrentLine(false);
}
@Override
public void setText(String text_in) {
fields.setText(text_in);
fields.setCaretPosition(0);
}
}

12
src/Common/Visual/Windows/Dialog/Text/ReadOnlyMultilineTextForm.java
View File

@@ -1,12 +0,0 @@
package Common.Visual.Windows.Dialog.Text;
public class ReadOnlyMultilineTextForm extends MultilineTextForm {
public ReadOnlyMultilineTextForm() {
}
@Override
public void InitFields() {
fields.setEditable(false);
}
@Override
public void CreateButtons() {
}
}