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

no message

Browse Source
This commit is contained in:
02090095
2024-10-15 13:35:33 +03:00
parent e4d907e4a3
commit b7b82e54c6
121 changed files with 204 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/_VisualDVM/Visual/Interface/ProjectWindow.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.Trees.TreeForm;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public interface ProjectWindow {
//-
ArraysWindow getArraysWindow();

52
src/_VisualDVM/Visual/MainUI.java
View File

@@ -1,9 +1,26 @@
package _VisualDVM.Visual;
import Common.Visual.Tables.ConfigurationAutoRenderer;
import Common.Visual.Tables.ConfigurationAutoSwitcher;
import Common.Visual.Tables.VectorEditor;
import Common.Visual.Trees.GraphTreeCellRenderer;
import Common.Visual.UIModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueEditor;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileChooser;
import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileRenderer;
import _VisualDVM.ProjectData.Files.UI.FilesTreeCellRenderer;
import _VisualDVM.ProjectData.Project.UI.VersionsTreeCellRenderer;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionRenderer;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionStateChanger;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.RulesTreeCellRenderer;
import _VisualDVM.ProjectData.SapforData.Variants.UI.VariantRankRenderer;
import _VisualDVM.Repository.Component.UI.ComponentsForm;
import _VisualDVM.TestingSystem.Common.TestingMenuBar;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.VersionsWindow;
import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsMenuBar;
@@ -11,19 +28,47 @@ import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
import _VisualDVM.Visual.Windows.*;
import static Common.Visual.Tables.TableEditors.*;
import static Common.Visual.Tables.TableRenderers.*;
import static Common.Visual.Trees.TreeRenderers.*;
public class MainUI extends UIModule_ {
public MainWindow mainWindow = null;
ComponentsForm componentsWindow = null;
public SearchReplaceForm searchReplaceWindow = null;
public ProfilesForm profilesWindow = null;
public VersionsWindow versionsWindow = null;
public DebugWindow debugWindow = null;
public RemoteFileChooser remoteFileChooser = null;
ComponentsForm componentsWindow = null;
//-
TestingMenuBar testingMenuBar = null;
CredentialsMenuBar credentialsMenuBar = null;
VersionsMenuBar versionsMenuBar = null;
//-
//-
public MainUI() {
setTheme(new LightSPFEditorTheme());
tableRenderers.put(RendererDimension, new DimensionRenderer());
tableRenderers.put(RendererVariantRank, new VariantRankRenderer());
tableRenderers.put(RendererCompilerOptionParameterValue, new CompilerOptionParameterValueRenderer());
tableRenderers.put(RendererCompilerOptionParameterName, new CompilerOptionParameterNameRenderer());
tableRenderers.put(RendererCompilerEnvironmentValue, new CompilerEnvironmentValueRenderer());
tableRenderers.put(RendererAutoConfiguration, new ConfigurationAutoRenderer());
//--
tableEditors.put(EditorHyperlinks, new VectorEditor());
tableEditors.put(EditorDimension, new DimensionStateChanger());
tableEditors.put(EditorCompilerOptionParameterValue, new CompilerOptionParameterValueEditor());
tableEditors.put(EditorCompilerEnvironmentValue, new CompilerEnvironmentValueEditor());
tableEditors.put(EditorAutoConfiguration, new ConfigurationAutoSwitcher());
//--
treeRenderers.put(RendererGraph, new GraphTreeCellRenderer());
treeRenderers.put(RendererRemoteFile, new RemoteFileRenderer());
treeRenderers.put(RendererFile, new FilesTreeCellRenderer());
treeRenderers.put(RendererVersion, new VersionsTreeCellRenderer());
treeRenderers.put(RendererSapforVersion, new SapforVersionsTreeCellRenderer());
treeRenderers.put(RendererRule, new RulesTreeCellRenderer());
}
//-
public TestingMenuBar getTestingMenuBar() {
if (testingMenuBar == null)
testingMenuBar = new TestingMenuBar();
@@ -39,11 +84,6 @@ public class MainUI extends UIModule_ {
credentialsMenuBar = new CredentialsMenuBar();
return credentialsMenuBar;
}
//-
//-
public MainUI() {
setTheme(new LightSPFEditorTheme());
}
public MainWindow getMainWindow() {
if (mainWindow == null)
mainWindow = new MainForm();

36
src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
View File

@@ -1,36 +0,0 @@
package _VisualDVM.Visual.Menus.FastAccessMenuBar;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import javax.swing.*;
import java.awt.*;
public class FastAccessMenuBar extends VisualiserMenuBar {
@Override
public void setSizeLimits() {
//если задавать PreffredSize 0, скролл НЕ РАБОТАЕТ. Магия!
}
public void showPass(Pass pass) {
JButton button = pass.createButton();
add(button);
Dimension d = button.getPreferredSize();
button.setPreferredSize(new Dimension(d.width, 30));
revalidate();
repaint();
}
public void Refresh() {
Drop();
int i = 1;
for (Object pass : MainModule_.instance.getFirstAccessPasses()) {
showPass((Pass) pass);
++i;
if (i > ((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
}
}
public void Drop() {
UI_.Clear(this);
}
}

1
src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
View File

@@ -4,7 +4,6 @@ import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

1
src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
View File

@@ -7,7 +7,6 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Visual.Menus.LanguagesSubmenu;
import _VisualDVM.Visual.Menus.StylesSubmenu;
import _VisualDVM.Visual.Menus.TypesSubmenu;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class FileSettingsMenu extends VisualiserMenu {

1
src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
View File

@@ -7,7 +7,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

1
src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

1
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

1
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
View File

@@ -6,7 +6,6 @@ import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.util.LinkedHashMap;

1
src/_VisualDVM/Visual/Menus/VersionsMenu.java
View File

@@ -5,7 +5,6 @@ import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.Trees.DataTree;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
public class VersionsMenu extends GraphMenu<DataTree> {
VisualiserMenuItem m_select_all;
VisualiserMenuItem m_unselect_all;

2
src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
View File

@@ -15,4 +15,6 @@ public abstract class SPFEditorTheme extends VisualiserTheme {
}
return res;
}
//-
}

75
src/_VisualDVM/Visual/UI.java
View File

@@ -1,75 +0,0 @@
package _VisualDVM.Visual;
import Common.Visual.Tables.*;
import Common.Visual.Trees.GraphTreeCellRenderer;
import Common.Visual.Trees.SelectionTreeCellRenderer;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueEditor;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileRenderer;
import _VisualDVM.ProjectData.Files.UI.FilesTreeCellRenderer;
import _VisualDVM.ProjectData.Project.UI.VersionsTreeCellRenderer;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionRenderer;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionStateChanger;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.RulesTreeCellRenderer;
import _VisualDVM.ProjectData.SapforData.Variants.UI.VariantRankRenderer;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.text.DefaultHighlighter;
import javax.swing.text.Highlighter;
import javax.swing.tree.TreeCellRenderer;
import java.awt.*;
import java.util.LinkedHashMap;
import static Common.Visual.Tables.TableEditors.*;
import static Common.Visual.Tables.TableRenderers.*;
import static Common.Visual.Trees.TreeRenderers.*;
public class UI {
//------------
public static final Highlighter.HighlightPainter GoodLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
public static final Highlighter.HighlightPainter BadLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
public static LinkedHashMap<Common.Visual.Tables.TableRenderers, TableCellRenderer> TableRenderers = new LinkedHashMap<>();
public static LinkedHashMap<Common.Visual.Tables.TableEditors, TableCellEditor> TableEditors = new LinkedHashMap<>();
public static LinkedHashMap<Common.Visual.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>();
//ФОРМЫ
//-
public static void CreateAll() {
//<editor-fold desc="Объекты отрисовки и редактирования деревьев и таблиц">
TableRenderers.put(RendererDate, new DateRenderer_());
TableRenderers.put(RendererProgress, new ProgressBarRenderer());
TableRenderers.put(RendererSelect, new DBObjectSelectionRenderer());
TableRenderers.put(RendererDimension, new DimensionRenderer());
TableRenderers.put(RendererMultiline, new MultilineRenderer());
TableRenderers.put(RendererHyperlinks, new HyperlinksRenderer());
TableRenderers.put(RendererTopLeft, new TopLeftRenderer());
TableRenderers.put(RendererMaskedInt, new MaskedIntegerValueRenderer());
TableRenderers.put(RendererVariantRank, new VariantRankRenderer());
TableRenderers.put(RendererHiddenList, new HiddenListRenderer());
TableRenderers.put(RendererWrapText, new WrapTextRenderer());
TableRenderers.put(RendererCompilerOptionParameterValue, new CompilerOptionParameterValueRenderer());
TableRenderers.put(RendererCompilerOptionParameterName, new CompilerOptionParameterNameRenderer());
TableRenderers.put(RendererCompilerEnvironmentValue, new CompilerEnvironmentValueRenderer());
TableRenderers.put(RendererStatusEnum, new StatusEnumRenderer());
TableRenderers.put(RendererAutoConfiguration, new ConfigurationAutoRenderer());
//---------------------------------------------
TreeRenderers.put(RendererGraph, new GraphTreeCellRenderer());
TreeRenderers.put(RendererRemoteFile, new RemoteFileRenderer());
TreeRenderers.put(RendererFile, new FilesTreeCellRenderer());
TreeRenderers.put(RendererVersion, new VersionsTreeCellRenderer());
TreeRenderers.put(RendererSapforVersion, new SapforVersionsTreeCellRenderer());
TreeRenderers.put(RendererRule, new RulesTreeCellRenderer());
TreeRenderers.put(RendererSelection, new SelectionTreeCellRenderer());
//----------------------------------------------
TableEditors.put(EditorSelect, new DBObjectSelector());
TableEditors.put(EditorHyperlinks, new VectorEditor());
TableEditors.put(EditorDimension, new DimensionStateChanger());
TableEditors.put(EditorCompilerOptionParameterValue, new CompilerOptionParameterValueEditor());
TableEditors.put(EditorCompilerEnvironmentValue, new CompilerEnvironmentValueEditor());
TableEditors.put(EditorAutoConfiguration, new ConfigurationAutoSwitcher());
//</editor-fold>
}
}

1
src/_VisualDVM/Visual/Windows/CallbackForm.java
View File

@@ -15,7 +15,6 @@ import _VisualDVM.Visual.Interface.CallbackWindow;
import _VisualDVM.Visual.Interface.CommentInterface;
import _VisualDVM.Visual.Interface.DescriptionInterface;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import javax.swing.event.DocumentEvent;

5
src/_VisualDVM/Visual/Windows/ComparisonForm.java
View File

@@ -11,7 +11,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
import org.fife.ui.rtextarea.RTextScrollPane;
@@ -232,7 +231,9 @@ public abstract class ComparisonForm<T> {
slave_highlighter.addHighlight(
slave.Body.getLineStartOffset(colors.get(diff_num).getKey()),
slave.Body.getLineEndOffset(colors.get(diff_num).getKey()),
colors.get(diff_num).getValue() ? UI.GoodLoopPainter : UI.BadLoopPainter
colors.get(diff_num).getValue() ?
UI_.GreenTextPainter :
UI_.RedTextPainter
);
}
if (colors.size() > 0) current_diff_line = 0;

5
src/_VisualDVM/Visual/Windows/FileForm.java
View File

@@ -38,6 +38,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
public JSplitPane SC12;
@Description("IGNORE")
protected boolean events_on = true;
FileMenuBar fileMenuBar = null;
//-
private JPanel content;
private JButton bClose;
@@ -66,7 +67,6 @@ public class FileForm implements FileWindow, FormWithSplitters {
private TreeForm arraysForm;
//-
private SPFEditor Body = null; //времянка? не очень красиво.
FileMenuBar fileMenuBar= null;
//-
public FileForm(DBProjectFile file_in) {
LoadSplitters();
@@ -191,9 +191,8 @@ public class FileForm implements FileWindow, FormWithSplitters {
//---
@Override
public void RefreshTabsNames() {
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
UI_.ShowTabsNames(graphsTabs,flag);
UI_.ShowTabsNames(graphsTabs, flag);
//--
ShowNotesCount();
ShowWarningsCount();

7
src/_VisualDVM/Visual/Windows/MainForm.java
View File

@@ -10,7 +10,6 @@ import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Visual.Interface.*;
import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;
@@ -18,6 +17,7 @@ import java.util.Vector;
public class MainForm extends Form implements MainWindow {
private final WelcomeForm welcomeForm = new WelcomeForm(); //заглушка когда проекта нет.
int global_index = 0;
MainMenuBar mainMenuBar;
//-----------------
private ProjectForm projectForm;
private CallbackForm callbackForm;
@@ -28,9 +28,8 @@ public class MainForm extends Form implements MainWindow {
private JPanel Content;
private JTabbedPane globalTabs;
private JPanel mainPanel;
MainMenuBar mainMenuBar;
public MainForm() {
mainPanel.add( mainMenuBar = new MainMenuBar(), BorderLayout.NORTH);
mainPanel.add(mainMenuBar = new MainMenuBar(), BorderLayout.NORTH);
InstallWelcomePanel();
InstallCallbackPanel();
InstallTestsPanel();
@@ -62,7 +61,7 @@ public class MainForm extends Form implements MainWindow {
public void AfterClose() {
Global.mainModule.getPass(PassCode.CloseCurrentProject).Do();
if (Global.mainModule.getUI().getVersionsWindow() != null)
((FormWithSplitters)Global.mainModule.getUI().getVersionsWindow()).SaveSplitters();
((FormWithSplitters) Global.mainModule.getUI().getVersionsWindow()).SaveSplitters();
SaveCallbackPanel();
SaveTestsPanel();
SaveTestingPanel();

1
src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
View File

@@ -11,7 +11,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class SapforPackagesComparisonForm {

3
src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
View File

@@ -6,7 +6,6 @@ import Common.Visual.UI_;
import Common.Visual.Windows.Form;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rtextarea.SearchContext;
@@ -129,7 +128,7 @@ public class SearchReplaceForm extends Form {
}
@Override
public Component getRelative() {
return (Component) Global.mainModule.getUI().getMainWindow();
return (Component) Global.mainModule.getUI().getMainWindow();
}
@Override
public int getDefaultWidth() {

1
src/_VisualDVM/Visual/Windows/TestingForm.java
View File

@@ -12,7 +12,6 @@ import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import _VisualDVM.Visual.Interface.TestingWindow;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

2
src/_VisualDVM/Visual/Windows/VersionsForm.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Visual.Windows;
import Common.MainModule_;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI_;
import _VisualDVM.Global;
@@ -8,7 +7,6 @@ import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import _VisualDVM.Visual.Interface.VariantsWindow;
import _VisualDVM.Visual.Interface.VersionsWindow;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;