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

20
.idea/workspace.xml generated
View File

@@ -8,14 +8,21 @@
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/UI_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Account/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Account/Account.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportComment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportDescription.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportDescription.java" afterDir="false" />
@@ -86,8 +93,10 @@
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
@@ -98,6 +107,7 @@
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ProjectWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ProjectWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/FastAccessMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
@@ -105,13 +115,15 @@
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VersionsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -210,11 +222,11 @@
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
</key>
<key name="MoveMembersDialog.RECENTS_KEY">
<recent name="Common.Visual.UI_" />
<recent name="Common.Utils.Utils_" />
<recent name="Common.Visual.CommonUI" />
<recent name="CommomUI" />
<recent name="_VisualDVM.Global" />
<recent name="Common.CurrentAnchestor" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\Visual\Windows" />

7
src/Common/Database/Tables/DataSet.java
View File

@@ -42,7 +42,9 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
}
protected void createFilters() {
}
public Class getMenuBarClass(){return null;}
public Class getMenuBarClass() {
return null;
}
public void mountUI(JPanel content_in) {
UI_.Clear(content_in);
//-->
@@ -64,8 +66,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
if (ui_.hasCheckBox())
bar.createSelectionButtons(this);
//--
}
catch ( Exception ex){
} catch (Exception ex) {
ex.printStackTrace();
}
}

16
src/Common/MainModule_.java
View File

@@ -39,13 +39,21 @@ public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModu
objects = new LinkedHashMap<>();
}
//ИНТЕРФЕЙС
public boolean hasUI(){return ui!=null;}
public boolean hasUI() {
return ui != null;
}
public U getUI() {
return ui;
}
public boolean hasLastMenuPath(){return last_menu_path!=null;}
public MenuElement[] getLastMenuPath(){return last_menu_path;}
public MenuElement[] setLastMenuPath(MenuElement[] last_menu_path_in){return last_menu_path=last_menu_path_in;}
public boolean hasLastMenuPath() {
return last_menu_path != null;
}
public MenuElement[] getLastMenuPath() {
return last_menu_path;
}
public MenuElement[] setLastMenuPath(MenuElement[] last_menu_path_in) {
return last_menu_path = last_menu_path_in;
}
//БАЗА ДАННЫХ И ТЕКУЩИЕ ОБЪЕКТЫ
public D getDb() {
return db;

6
src/Common/Passes/Pass.java
View File

@@ -9,6 +9,7 @@ import Common.Visual.Controls.StablePassMenuItem;
import Common.Visual.UI_;
import Common.Visual.Windows.PassForm;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -94,7 +95,7 @@ public class Pass<T> {
} catch (Exception ex) {
Utils_.MainLog.PrintException(ex);
}
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
}
}
public boolean isDone() {
@@ -266,7 +267,8 @@ public class Pass<T> {
animation_sem.acquire();
//---
form = null;
MainModule_.instance.getUI().DropPassForm();;
MainModule_.instance.getUI().DropPassForm();
;
System.gc();
//--
form = MainModule_.instance.getUI().SetPassForm(new PassForm(this));

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

@@ -5,6 +5,7 @@ import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet;
import Common.Database.Tables.FKBehaviour;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.ColumnInfo;
@@ -12,7 +13,6 @@ import Common.Visual.Tables.DataTable;
import Common.Visual.Tables.Grid.GridAnchestor;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Grid.TableVisualData;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import javax.swing.table.TableColumn;
@@ -184,9 +184,9 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
ColumnInfo columnInfo = columns.get(i);
if (columnInfo.isVisible()) {
if (columnInfo.hasRenderer())
getColumnModel().getColumn(i).setCellRenderer(UI.TableRenderers.get(columnInfo.getRenderer()));
getColumnModel().getColumn(i).setCellRenderer(MainModule_.instance.getUI().getTableRenderer(columnInfo.getRenderer()));
if (columnInfo.hasEditor())
getColumnModel().getColumn(i).setCellEditor(UI.TableEditors.get(columnInfo.getEditor()));
getColumnModel().getColumn(i).setCellEditor(MainModule_.instance.getUI().getTableEditor(columnInfo.getEditor()));
if (columnInfo.hasMaxWidth())
getColumnModel().getColumn((i)).setMaxWidth(columnInfo.getMaxWidth());
if (columnInfo.hasMinWidth())

9
src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java → src/Common/Visual/Menus/FastAccessMenuBar.java
View File

@@ -1,10 +1,7 @@
package _VisualDVM.Visual.Menus.FastAccessMenuBar;
package Common.Visual.Menus;
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.*;
@@ -21,13 +18,13 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
revalidate();
repaint();
}
public void Refresh() {
public void Refresh(int limit) {
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;
if (i > limit) break;
}
}
public void Drop() {

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

@@ -3,7 +3,6 @@ import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import _VisualDVM.Visual.Menus.GraphMenu;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -26,7 +25,7 @@ public class StyledTree extends JTree implements ThemeElement {
setToggleClickCount(0); //отключение сворачивание разворачивания по двойному клику
//--
if (!getRenderer().equals(TreeRenderers.RendererUndefined))
setCellRenderer(UI.TreeRenderers.get(getRenderer()));
setCellRenderer(MainModule_.instance.getUI().getTreeRenderer(getRenderer()));
//--
getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
addTreeSelectionListener(e -> {

100
src/Common/Visual/UIModule_.java
View File

@@ -1,48 +1,34 @@
package Common.Visual;
import Common.Database.Tables.DataSet;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.FastAccessMenuBar;
import Common.Visual.Tables.*;
import Common.Visual.Themes.DefaultTheme;
import Common.Visual.Themes.VisualiserTheme;
import Common.Visual.Trees.SelectionTreeCellRenderer;
import Common.Visual.Windows.PassForm;
import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
import javax.swing.*;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.tree.TreeCellRenderer;
import java.awt.*;
import java.util.LinkedHashMap;
import java.util.Stack;
import static Common.Visual.Tables.TableEditors.EditorSelect;
import static Common.Visual.Tables.TableRenderers.*;
import static Common.Visual.Trees.TreeRenderers.RendererSelection;
public class UIModule_ {
public LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
public Stack<Component> windowsStack = new Stack<>();
protected LinkedHashMap<Common.Visual.Tables.TableRenderers, TableCellRenderer> tableRenderers = new LinkedHashMap<>();
protected LinkedHashMap<Common.Visual.Tables.TableEditors, TableCellEditor> tableEditors = new LinkedHashMap<>();
protected LinkedHashMap<Common.Visual.Trees.TreeRenderers, TreeCellRenderer> treeRenderers = new LinkedHashMap<>();
//--
VisualiserTheme theme = new DefaultTheme();
public VisualiserTheme getTheme() {
return theme;
}
public void setTheme(VisualiserTheme theme_in) {
theme = theme_in;
}
//--
PassForm passForm = null;//текущая форма прохода. нужна для
public boolean HasPassForm(){return passForm!=null;}
public PassForm GetPassForm(){return passForm;}
public PassForm SetPassForm(PassForm passForm_in){
return passForm = passForm_in;
}
public void DropPassForm(){passForm=null;}
//--
//--
FastAccessMenuBar fastAccessMenuBar = new FastAccessMenuBar();
public FastAccessMenuBar getFastAccessMenuBar(){return fastAccessMenuBar;}
//-
public LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
//--
public Stack<Component> windowsStack = new Stack<>();
public Component getFrontWindow() {
Component res = null;
try {
res = windowsStack.peek();
} catch (Exception ignored) {
}
return res;
}
PassForm passForm = null;//текущая форма прохода. нужна для
public UIModule_() {
//<editor-fold desc="Локализация компонентов окна JFileChooser">
UIManager.put("FileChooser.openButtonText", "Открыть");
@@ -76,5 +62,59 @@ public class UIModule_ {
UIManager.put("OptionPane.cancelButtonText", "Отмена");
UIManager.put("OptionPane.okButtonText", "Готово");
//</editor-fold>
tableRenderers.put(RendererDate, new DateRenderer_());
tableRenderers.put(RendererProgress, new ProgressBarRenderer());
tableRenderers.put(RendererSelect, new DBObjectSelectionRenderer());
tableRenderers.put(RendererMultiline, new MultilineRenderer());
tableRenderers.put(RendererHyperlinks, new HyperlinksRenderer());
tableRenderers.put(RendererTopLeft, new TopLeftRenderer());
tableRenderers.put(RendererMaskedInt, new MaskedIntegerValueRenderer());
tableRenderers.put(RendererHiddenList, new HiddenListRenderer());
tableRenderers.put(RendererWrapText, new WrapTextRenderer());
tableRenderers.put(RendererStatusEnum, new StatusEnumRenderer());
//-
tableEditors.put(EditorSelect, new DBObjectSelector());
//
treeRenderers.put(RendererSelection, new SelectionTreeCellRenderer());
}
//--
public VisualiserTheme getTheme() {
return theme;
}
public void setTheme(VisualiserTheme theme_in) {
theme = theme_in;
}
//--
public boolean HasPassForm() {
return passForm != null;
}
public PassForm GetPassForm() {
return passForm;
}
public PassForm SetPassForm(PassForm passForm_in) {
return passForm = passForm_in;
}
public void DropPassForm() {
passForm = null;
}
public FastAccessMenuBar getFastAccessMenuBar() {
return fastAccessMenuBar;
}
public Component getFrontWindow() {
Component res = null;
try {
res = windowsStack.peek();
} catch (Exception ignored) {
}
return res;
}
public TableCellRenderer getTableRenderer(Common.Visual.Tables.TableRenderers r_name) {
return tableRenderers.get(r_name);
}
public TableCellEditor getTableEditor(Common.Visual.Tables.TableEditors e_name) {
return tableEditors.get(e_name);
}
public TreeCellRenderer getTreeRenderer(Common.Visual.Trees.TreeRenderers r_name) {
return treeRenderers.get(r_name);
}
}

11
src/Common/Visual/UI_.java
View File

@@ -5,15 +5,18 @@ import Common.Utils.Utils_;
import javax.swing.*;
import javax.swing.event.ChangeListener;
import javax.swing.text.DefaultFormatter;
import javax.swing.text.DefaultHighlighter;
import javax.swing.text.Highlighter;
import java.awt.*;
import java.util.Stack;
public class UI_ {
public static boolean active = false; //есть ли интерфейс. в консольных версиях не нужен.
//---
//--
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 static boolean active = false;
public static boolean isActive() {
return active;
}
//-----
//---
public static void Clear(Container container) {
container.removeAll();
container.repaint();

3
src/_VisualDVM/Global.java
View File

@@ -19,7 +19,6 @@ import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.LocalDVMTestingPlanner;
import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
import _VisualDVM.Visual.UI;
import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
@@ -241,8 +240,6 @@ public class Global {
}
messagesServer = new MessagesServer();
messagesServer.Start();
//создание списков служебных объектов
UI.CreateAll();
Components = new ComponentsSet();
mainModule.set(Current.ProjectView, ProjectView.Files);
Components.put(ComponentType.Visualiser, visualiser = new Visualiser());

1
src/_VisualDVM/GlobalData/Account/Account.java
View File

@@ -3,7 +3,6 @@ import Common.Database.Objects.DBObject;
import Common.Utils.TextLog;
import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
public class Account extends DBObject {
@Description("PRIMARY KEY,NOT NULL")

1
src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -16,7 +16,6 @@ import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Utils;
import _VisualDVM.Validators.PathValidator;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
public class CompilersDBTable extends iDBTable<Compiler> {

2
src/_VisualDVM/GlobalData/GlobalDatabase.java
View File

@@ -91,7 +91,7 @@ public class GlobalDatabase extends VisualiserDatabase {
settings.AddAll();
runConfigurations.Patch();
//---
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
}
@Override
public PassCode getSynchronizePassCode() {

1
src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
View File

@@ -19,7 +19,6 @@ import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
public class MachinesDBTable extends iDBTable<Machine> {

1
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Visual.Trees.TreeForm;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

1
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
View File

@@ -3,7 +3,6 @@ import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class RemoteFilesTree extends DataTree {
public RemoteFilesTree() {
super(Global.mainModule.getUI().getRemoteFileChooser().root);

1
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
View File

@@ -10,7 +10,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;

1
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -5,7 +5,6 @@ import Common.Visual.Menus.TableMenu;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import static Common.Visual.Tables.TableRenderers.RendererDate;
import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;

1
src/_VisualDVM/GlobalData/User/UsersDBTable.java
View File

@@ -13,7 +13,6 @@ import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.UI.UserFields;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
public class UsersDBTable extends iDBTable<User> {

1
src/_VisualDVM/Passes/All/AddFile.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import javax.swing.tree.DefaultMutableTreeNode;

1
src/_VisualDVM/Passes/All/AppendBugReportComment.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class AppendBugReportComment extends AppendBugReportField {
@Override
protected boolean canStart(Object... args) throws Exception {

1
src/_VisualDVM/Passes/All/AppendBugReportDescription.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class AppendBugReportDescription extends AppendBugReportField {
@Override
protected boolean canStart(Object... args) throws Exception {

1
src/_VisualDVM/Passes/All/AppendBugReportField.java
View File

@@ -9,7 +9,6 @@ import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import java.util.Date;

1
src/_VisualDVM/Passes/All/ApplyCurrentFunction.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.Visual.UI;
import java.util.Comparator;
import java.util.Vector;

1
src/_VisualDVM/Passes/All/CheckAccount.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
public class CheckAccount extends Pass<Boolean> {
@Override
protected boolean canStart(Object... args) throws Exception {

1
src/_VisualDVM/Passes/All/CleanAnalyses.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.Visual.UI;
public class CleanAnalyses extends CurrentProjectPass {
@Override
protected boolean canStart(Object... args) throws Exception {

1
src/_VisualDVM/Passes/All/CloseCurrentFile.java
View File

@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class CloseCurrentFile extends Pass<DBProjectFile> {

1
src/_VisualDVM/Passes/All/CloseCurrentProject.java
View File

@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class CloseCurrentProject extends Pass<db_project_info> {

1
src/_VisualDVM/Passes/All/CompareDVMRunTasks.java
View File

@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {

1
src/_VisualDVM/Passes/All/CompareSapforPackages.java
View File

@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {

1
src/_VisualDVM/Passes/All/Compile.java
View File

@@ -10,7 +10,6 @@ import _VisualDVM.GlobalData.User.UserState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.UI;
public class Compile extends Pass<db_project_info> {
Pass subpass = null;
CompilationTask compilationTask = null;

1
src/_VisualDVM/Passes/All/CreateEmptyDirectory.java
View File

@@ -5,7 +5,6 @@ import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.Visual.UI;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;

1
src/_VisualDVM/Passes/All/CreateParallelVariants.java
View File

@@ -3,7 +3,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.VariantsMassPass;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.UI;
public class CreateParallelVariants extends VariantsMassPass {
@Override
public String getIconPath() {

1
src/_VisualDVM/Passes/All/DVMConvertProject.java
View File

@@ -12,7 +12,6 @@ import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import javax.swing.*;

1
src/_VisualDVM/Passes/All/DeleteDVMPackage.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Testing.DeleteTestingPackages;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.Visual.UI;
import java.io.File;
public class DeleteDVMPackage extends DeleteTestingPackages<DVMPackage> {

1
src/_VisualDVM/Passes/All/DeleteDirectory.java
View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import java.io.File;

1
src/_VisualDVM/Passes/All/DeleteFile.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
public class DeleteFile extends ChangeFilePass<DBProjectFile> {
@Override
public String getIconPath() {

1
src/_VisualDVM/Passes/All/DeleteSapforPackage.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Testing.DeleteTestingPackages;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Visual.UI;
import java.io.File;
public class DeleteSapforPackage extends DeleteTestingPackages<SapforPackage> {

1
src/_VisualDVM/Passes/All/DeleteSelectedFiles.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
public class DeleteSelectedFiles extends Pass {
@Override
public String getIconPath() {

1
src/_VisualDVM/Passes/All/DeleteVersion.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.UI;
public class DeleteVersion extends Pass<db_project_info> {
db_project_info parent;
boolean current;

1
src/_VisualDVM/Passes/All/DownloadDVMPackage.java
View File

@@ -3,7 +3,6 @@ import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.Visual.UI;
import java.io.File;
import java.util.Vector;

1
src/_VisualDVM/Passes/All/DownloadProject.java
View File

@@ -8,7 +8,6 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.CurrentConnectionPass;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import java.io.File;
import java.nio.file.Paths;

1
src/_VisualDVM/Passes/All/ExcludeFile.java
View File

@@ -4,7 +4,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.Visual.UI;
public class ExcludeFile extends Pass<DBProjectFile> {
@Override
public String getIconPath() {

1
src/_VisualDVM/Passes/All/GenerateParallelVariants.java
View File

@@ -3,7 +3,6 @@ import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.Visual.UI;
import java.math.BigInteger;
public class GenerateParallelVariants extends CurrentProjectPass {

1
src/_VisualDVM/Passes/All/IncludeFile.java
View File

@@ -4,7 +4,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.Visual.UI;
public class IncludeFile extends Pass<DBProjectFile> {
@Override
public String getIconPath() {

1
src/_VisualDVM/Passes/All/OpenCurrentFile.java
View File

@@ -4,7 +4,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
public class OpenCurrentFile extends Pass<DBProjectFile> {
@Override
protected boolean canStart(Object... args) throws Exception {

1
src/_VisualDVM/Passes/All/OpenCurrentProject.java
View File

@@ -12,7 +12,6 @@ import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import java.io.File;
public class OpenCurrentProject extends Pass<db_project_info> {

1
src/_VisualDVM/Passes/All/Precompilation.java
View File

@@ -16,7 +16,6 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import java.io.BufferedReader;

1
src/_VisualDVM/Passes/All/PublishBugReport.java
View File

@@ -9,7 +9,6 @@ import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Visual.UI;
import java.io.File;
import java.util.Date;

1
src/_VisualDVM/Passes/All/PublishComponent.java
View File

@@ -12,7 +12,6 @@ import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Visual.UI;
import java.util.Date;
import java.util.Vector;

1
src/_VisualDVM/Passes/All/PublishTests.java
View File

@@ -9,7 +9,6 @@ import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Visual.UI;
import java.io.File;
import java.util.Vector;

1
src/_VisualDVM/Passes/All/RenameDirectory.java
View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import javax.swing.tree.DefaultMutableTreeNode;

1
src/_VisualDVM/Passes/All/RenameFile.java
View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.Visual.UI;
import java.io.File;
import java.nio.file.Paths;

1
src/_VisualDVM/Passes/All/Run.java
View File

@@ -9,7 +9,6 @@ import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class Run extends Pass<db_project_info> {

1
src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
View File

@@ -4,7 +4,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.Visual.UI;
import java.math.BigInteger;
public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {

1
src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java
View File

@@ -4,7 +4,6 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.Visual.UI;
public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalysis {
@Override
protected void performDone() throws Exception {

1
src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.Visual.UI;
import java.util.Comparator;
import java.util.Vector;

1
src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java
View File

@@ -3,7 +3,6 @@ import Common.Utils.Index;
import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.Visual.UI;
public class SPF_GetArrayDistributionOnlyRegions extends SapforAnalysis {
@Override
public String phase() {

1
src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java
View File

@@ -3,7 +3,6 @@ import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
public class SPF_GetFileLineInfo extends SapforAnalysis {
@Override
public String phase() {

1
src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import java.util.Vector;

1
src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java
View File

@@ -9,7 +9,6 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
import java.util.Vector;

1
src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java
View File

@@ -5,7 +5,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Loops.Loop;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class SPF_GetGraphLoops extends SapforAnalysis {

1
src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
View File

@@ -10,7 +10,6 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo;
import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import javax.swing.tree.DefaultMutableTreeNode;
public class SPF_GetIncludeDependencies extends SapforAnalysis {

1
src/_VisualDVM/Passes/All/SPF_InlineProcedures.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class SPF_InlineProcedures extends SapforTransformation {

1
src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java
View File

@@ -5,7 +5,6 @@ import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class SPF_InlineProceduresH extends SapforTransformation {

1
src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo;
import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
import _VisualDVM.Visual.UI;
import java.util.Vector;
import java.util.stream.Collectors;

1
src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java
View File

@@ -9,7 +9,6 @@ import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.ProjectData.SapforData.Regions.UI.ArrayAlignmentBar;
import _VisualDVM.ProjectData.SapforData.Regions.UI.ParallelRegionFields;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

1
src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import java.util.Vector;

1
src/_VisualDVM/Passes/All/SaveBugReportComment.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class SaveBugReportComment extends UpdateBugReportField {
@Override
public String getIconPath() {

1
src/_VisualDVM/Passes/All/SaveBugReportDescription.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class SaveBugReportDescription extends UpdateBugReportField {
@Override
public String getIconPath() {

1
src/_VisualDVM/Passes/All/SaveFunctionsGraphCoordinates.java
View File

@@ -3,7 +3,6 @@ import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
import _VisualDVM.Visual.UI;
public class SaveFunctionsGraphCoordinates extends Pass {
FunctionsGraphForm graphForm = null;
@Override

1
src/_VisualDVM/Passes/All/SaveGraph.java
View File

@@ -5,7 +5,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
import _VisualDVM.Visual.UI;
import com.mxgraph.io.mxCodec;
import com.mxgraph.util.mxCellRenderer;
import com.mxgraph.util.mxXmlUtils;

1
src/_VisualDVM/Passes/All/SelectRemoteFile.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.SSH.CurrentConnectionPass;
import _VisualDVM.Visual.UI;
public class SelectRemoteFile extends CurrentConnectionPass {
boolean dialogOK;
boolean needs_directory = false;

1
src/_VisualDVM/Passes/All/SynchronizeBugReports.java
View File

@@ -5,7 +5,6 @@ import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import java.io.File;

1
src/_VisualDVM/Passes/All/SynchronizeTests.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.Server.TestingSystemPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import javax.swing.*;

1
src/_VisualDVM/Passes/All/UpdateBugReportField.java
View File

@@ -11,7 +11,6 @@ import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import java.io.Serializable;

1
src/_VisualDVM/Passes/All/UpdateProperty.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.Visual.UI;
import java.lang.reflect.Field;
public class UpdateProperty extends Pass<Object> {

4
src/_VisualDVM/Passes/All/UpdateSetting.java
View File

@@ -5,9 +5,9 @@ import Common.Visual.Windows.Dialog.*;
import Common.Visual.Windows.Dialog.Text.TextFieldDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.DBSetting;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.io.File;
@@ -120,7 +120,7 @@ public class UpdateSetting extends Pass<DBSetting> {
break;
case FastAccessPassesCount:
if (Global.mainModule.HasProject())
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
break;
case ShowFullArraysDeclarations:
if (Global.mainModule.HasProject())

1
src/_VisualDVM/Passes/Project/FilesMassPass.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.Project;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
public abstract class FilesMassPass<T> extends Pass<T> {
@Override
protected boolean canStart(Object... args) throws Exception {

1
src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java
View File

@@ -6,7 +6,6 @@ import Common.Visual.Controls.PassMenuItem;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.event.ActionEvent;

1
src/_VisualDVM/Passes/Sapfor/SapforPass.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.Sapfor;
import Common.Passes.PassException;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class SapforPass extends SilentSapforPass {
//отличается наличием журнала и сообщений
@Override

1
src/_VisualDVM/Passes/Sapfor/SapforTransformation.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class SapforTransformation extends SapforPass {

1
src/_VisualDVM/Passes/Sapfor/Transformation.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class Transformation extends CurrentProjectPass {

1
src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java
View File

@@ -5,7 +5,6 @@ import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Visual.UI;
public abstract class VariantsMassPass extends CurrentProjectPass {
int count;
public abstract PassCode getSubPassCode();

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

@@ -13,7 +13,6 @@ import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Editor.CaretInfo;
import _VisualDVM.Visual.Interface.SPFEditorInterface;
import _VisualDVM.Visual.Menus.MainEditorMenu;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;

1
src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.Files.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

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

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.Menus.GraphMenu;
import _VisualDVM.Visual.Menus.ProjectFilesMenu;
import _VisualDVM.Visual.UI;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;

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

@@ -36,7 +36,6 @@ import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
import _VisualDVM.TestingSystem.Common.Test.ProjectFiles_json;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import com.mxgraph.swing.mxGraphComponent;
import com.sun.org.glassfish.gmbal.Description;
import javafx.util.Pair;

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

@@ -4,7 +4,6 @@ import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {

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

@@ -1,4 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.MainModule_;
import Common.Visual.ControlForm;
import Common.Visual.Tables.Grid.GridAnchestor;
import Common.Visual.Tables.StyledTable;
@@ -6,7 +7,6 @@ import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import _VisualDVM.Visual.UI;
import java.awt.*;
import java.util.Vector;
@@ -48,8 +48,8 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
}) {
@Override
public void Init() {
setDefaultRenderer(TemplateDimension.class, UI.TableRenderers.get(RendererDimension));
setDefaultEditor(TemplateDimension.class, UI.TableEditors.get(EditorDimension));
setDefaultRenderer(TemplateDimension.class, MainModule_.instance.getUI().getTableRenderer(RendererDimension));
setDefaultEditor(TemplateDimension.class, MainModule_.instance.getUI().getTableEditor(EditorDimension));
}
};
}

1
src/_VisualDVM/ProjectData/SapforData/FileObject.java
View File

@@ -3,7 +3,6 @@ import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
//объект принадлежащий файлу и относящийся к его строке.
public abstract class FileObject extends iDBObject {

1
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.event.ActionEvent;

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 _VisualDVM.Visual.UI;
import Common.Visual.UI_;
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.GoodLoopPainter;
return UI_.GreenTextPainter;
case BadLoop:
return UI.BadLoopPainter;
return UI_.RedTextPainter;
default:
return null;
}

1
src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
View File

@@ -5,7 +5,6 @@ import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatistics_2021;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import java.io.File;

1
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.event.ActionEvent;

1
src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
View File

@@ -14,7 +14,6 @@ import _VisualDVM.Repository.Component.OSDComponent;
import _VisualDVM.Repository.Component.Visualizer_2;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import java.io.File;

1
src/_VisualDVM/TestingSystem/Common/Group/Group.java
View File

@@ -9,7 +9,6 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap;

1
src/_VisualDVM/TestingSystem/Common/Test/Test.java
View File

@@ -13,7 +13,6 @@ import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.RepositoryRefuseException;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;

1
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.Visual.UI;
import java.util.Comparator;
import java.util.Date;

1
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
View File

@@ -4,7 +4,6 @@ import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;
import _VisualDVM.Visual.UI;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;

Some files were not shown because too many files have changed in this diff Show More