From 5e2a9848da6dab731ffcb19718b495c788f5f2e2 Mon Sep 17 00:00:00 2001 From: 02090095 Date: Tue, 15 Oct 2024 15:13:57 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=BF=D1=80=D0=B0=D0=B7=D0=B4=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D1=85=20?= =?UTF-8?q?=D0=B5=D0=BD=D1=83=D0=BC=D0=BE=D0=B2=20=D0=B2=20=D0=BE=D1=84?= =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=82=D0=B0?= =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D1=86=20=D0=B8=20=D0=B4=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B2=D1=8C=D0=B5=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 165 ++++++++++-------- .../Database/SQLITE/SQLiteDatabase.java | 6 +- src/Common/Database/Tables/DataSet.java | 6 +- src/Common/MainModule_.java | 6 +- src/Common/Passes/Pass.java | 28 +-- src/Common/Utils/Loggable.java | 6 +- src/Common/Visual/DataSetControlForm.java | 13 +- .../Visual/Menus/FastAccessMenuBar.java | 4 +- src/Common/Visual/Menus/TextComboBoxMenu.java | 4 +- src/Common/Visual/Tables/ColumnInfo.java | 50 ++---- .../Tables/DBObjectSelectionRenderer.java | 2 +- .../Visual/Tables/DBObjectSelector.java | 2 +- ...BObjectEditor.java => EditorDBObject.java} | 2 +- ...nderer.java => RendereEditableHeader.java} | 4 +- ...ectRenderer.java => RendererDBObject.java} | 2 +- .../{DateRenderer_.java => RendererDate.java} | 2 +- ...tRenderer.java => RendererHiddenList.java} | 2 +- ...rer.java => RendererMaskedNanInteger.java} | 2 +- ...neRenderer.java => RendererMultiline.java} | 2 +- ...Renderer.java => RendererProgressBar.java} | 2 +- ...mRenderer.java => RendererStatusEnum.java} | 2 +- ...LeftRenderer.java => RendererTopLeft.java} | 2 +- ...extRenderer.java => RendererWrapText.java} | 4 +- src/Common/Visual/Tables/TableEditors.java | 10 -- src/Common/Visual/Tables/TableRenderers.java | 20 --- src/Common/Visual/Trees/StyledTree.java | 8 +- src/Common/Visual/Trees/TreeForm.java | 4 +- src/Common/Visual/Trees/TreeRenderers.java | 13 -- src/Common/Visual/{UI_.java => UI.java} | 15 +- src/Common/Visual/UIModule_.java | 73 +++++--- src/Common/Visual/Windows/Dialog/Dialog.java | 4 +- src/_VisualDVM/Global.java | 12 +- .../GlobalData/Compiler/CompilersDBTable.java | 4 +- .../Compiler/UI/CompilerFields.java | 4 +- .../CompilerEnvironmentsSet.java | 13 +- .../UI/CompilerEnvironmentValueEditor.java | 8 +- .../UI/CompilerEnvironmentValueRenderer.java | 4 +- .../CompilerOption/CompilerOptionsSet.java | 15 +- .../CompilerOptionParameterNameRenderer.java | 4 +- .../CompilerOptionParameterValueEditor.java | 8 +- .../CompilerOptionParameterValueRenderer.java | 4 +- .../DVMParameter/DVMParameterDBTable.java | 4 +- .../EnvironmentValuesDBTable.java | 4 +- .../FileObject/DirInfosDataSet.java | 5 +- .../GlobalData/Machine/MachinesDBTable.java | 4 +- .../Module/UI/ModuleAnchestorFields.java | 8 +- .../Module/UI/ModuleAnchestorForm.java | 8 +- .../RemoteFile/UI/RemoteFileChooser.java | 4 +- .../RemoteFile/UI/RemoteFilesTree.java | 5 +- ...derer.java => RendererTreeRemoteFile.java} | 2 +- .../RunConfigurationsDBTable.java | 8 +- .../CompilationTasksDBTable.java | 8 +- .../Tasks/RunTask/RunTasksDBTable.java | 8 +- .../GlobalData/User/UsersDBTable.java | 4 +- src/_VisualDVM/Passes/All/AddBugReport.java | 4 +- .../Passes/All/CompareDVMRunTasks.java | 8 +- .../Passes/All/CompareSapforPackages.java | 8 +- .../Passes/All/ConvertCorrectnessTests.java | 4 +- src/_VisualDVM/Passes/All/CopyProject.java | 4 +- .../CreateTestsGroupFromSelectedVersions.java | 4 +- .../Passes/All/DVMConvertProject.java | 4 +- .../Passes/All/DeleteDirectory.java | 4 +- src/_VisualDVM/Passes/All/DeleteFile.java | 4 +- .../Passes/All/DeleteSelectedFiles.java | 4 +- .../Passes/All/DeleteSelectedVersions.java | 4 +- src/_VisualDVM/Passes/All/DeleteVersion.java | 8 +- .../Passes/All/DownloadProject.java | 4 +- src/_VisualDVM/Passes/All/DownloadTest.java | 4 +- src/_VisualDVM/Passes/All/EditAccount.java | 8 +- .../Passes/All/ExportDVMPackageToExcel.java | 4 +- .../Passes/All/GenerateParallelVariants.java | 4 +- src/_VisualDVM/Passes/All/Precompilation.java | 4 +- .../Passes/All/PublishBugReport.java | 4 +- src/_VisualDVM/Passes/All/PublishTests.java | 4 +- .../Passes/All/ReplaceTestsFromFiles.java | 4 +- .../Passes/All/SPF_CreateParallelVariant.java | 4 +- .../Passes/All/SPF_GetArrayDistribution.java | 4 +- .../Passes/All/SPF_GetGCovInfo.java | 4 +- .../Passes/All/SPF_ParseFilesWithOrder.java | 4 +- src/_VisualDVM/Passes/All/SaveGraph.java | 4 +- .../All/StartSelectedDVMConfigurations.java | 4 +- .../StartSelectedSAPFORConfigurations.java | 4 +- .../Passes/Sapfor/SapforAnalysis.java | 4 +- .../Passes/Server/DeleteServerObjects.java | 4 +- .../Passes/Testing/StartTestingPackage.java | 4 +- .../Files/UI/Editor/SPFEditor.java | 3 + .../ProjectData/Files/UI/FileGraphTree.java | 6 +- .../ProjectData/Files/UI/FilesTree.java | 5 +- .../ProjectData/Messages/MessagesDBTable.java | 4 +- .../RecommendationsDBTable.java | 4 +- ...derer.java => RendererProjectVersion.java} | 2 +- .../ProjectData/Project/UI/VersionsTree.java | 5 +- .../ProjectData/Project/db_project_info.java | 4 +- .../SapforData/Arrays/ArraysSet.java | 12 +- .../Arrays/UI/DimensionStateChanger.java | 4 +- .../Arrays/UI/DimensionsTableForm.java | 11 +- ...ellRenderer.java => RendererTreeRule.java} | 2 +- .../SapforData/Arrays/UI/RulesTree.java | 6 +- .../SapforData/Functions/FuncCall.java | 4 +- .../SapforData/Functions/FuncCallH.java | 4 +- .../UI/Graph/FunctionsGraphForm.java | 4 +- .../Functions/UI/Graph/FunctionsGraphUI.java | 4 +- .../SapforData/Functions/UI/InlineTree.java | 6 +- .../SapforData/Functions/UI/InlineTree2.java | 6 +- .../SapforData/Includes/UI/IncludesTree.java | 6 +- .../SapforData/Loops/LoopState.java | 6 +- .../SapforData/Regions/RegionsSet.java | 9 +- .../Variants/UI/RendererVariantRank.java | 8 + .../Variants/UI/VariantRankRenderer.java | 8 - .../SapforData/Variants/VariantsSet.java | 13 +- .../BugReport/BugReportsDBTable.java | 13 +- .../Repository/Component/ComponentsSet.java | 10 +- .../PerformanceAnalyzer.java | 4 +- .../Repository/Component/Sapfor/Sapfor.java | 10 +- .../Repository/Component/Visualizer_2.java | 4 +- .../Subscribes/UI/SubscriberForm.java | 4 +- .../TestingSystem/Common/Group/Group.java | 4 +- .../Common/Group/GroupsDBTable.java | 6 +- .../TestingSystem/Common/Test/Test.java | 4 +- .../TestingSystem/Common/TestingMenuBar.java | 4 +- .../DVMConfigurationDBTable.java | 4 +- .../DVM/DVMPackage/DVMPackageDBTable.java | 16 +- .../DVM/DVMTasks/DVMRunTasksSet.java | 10 +- .../SapforConfigurationDBTable.java | 11 +- .../SapforPackage/SapforPackageDBTable.java | 16 +- .../SapforSettingsCommandsDBTable.java | 4 +- ...r.java => RendererTreeSapforVersions.java} | 2 +- .../UI/SapforTasksPackageTree.java | 5 +- .../ServerSapfor/ServerSapforsDBTable.java | 7 +- src/_VisualDVM/Utils.java | 4 +- src/_VisualDVM/Visual/Editor/BaseEditor.java | 4 +- src/_VisualDVM/Visual/MainUI.java | 42 +---- .../Visual/Menus/MainMenuBar/MainMenuBar.java | 4 +- .../Visual/Tables/EditorFilesHyperlinks.java} | 4 +- .../Tables/RendererConfigurationAuto.java} | 5 +- .../Visual/Tables/RendererHyperlinks.java} | 4 +- .../Tables/SwitcherConfigurationAuto.java} | 5 +- .../Visual/Windows/CallbackForm.java | 8 +- .../Visual/Windows/ComparisonForm.java | 9 +- src/_VisualDVM/Visual/Windows/FileForm.java | 14 +- .../Visual/Windows/FunctionsForm.java | 10 +- .../Visual/Windows/ProjectForm.java | 10 +- .../Windows/SapforPackagesComparisonForm.java | 6 +- .../Visual/Windows/SearchReplaceForm.java | 4 +- .../Visual/Windows/TestingForm.java | 6 +- .../Visual/Windows/VersionsForm.java | 4 +- 146 files changed, 565 insertions(+), 615 deletions(-) rename src/Common/Visual/Tables/{DBObjectEditor.java => EditorDBObject.java} (98%) rename src/Common/Visual/Tables/{EditableHeaderRenderer.java => RendereEditableHeader.java} (96%) rename src/Common/Visual/Tables/{DBObjectRenderer.java => RendererDBObject.java} (81%) rename src/Common/Visual/Tables/{DateRenderer_.java => RendererDate.java} (90%) rename src/Common/Visual/Tables/{HiddenListRenderer.java => RendererHiddenList.java} (88%) rename src/Common/Visual/Tables/{MaskedIntegerValueRenderer.java => RendererMaskedNanInteger.java} (86%) rename src/Common/Visual/Tables/{MultilineRenderer.java => RendererMultiline.java} (88%) rename src/Common/Visual/Tables/{ProgressBarRenderer.java => RendererProgressBar.java} (88%) rename src/Common/Visual/Tables/{StatusEnumRenderer.java => RendererStatusEnum.java} (88%) rename src/Common/Visual/Tables/{TopLeftRenderer.java => RendererTopLeft.java} (84%) rename src/Common/Visual/Tables/{WrapTextRenderer.java => RendererWrapText.java} (91%) delete mode 100644 src/Common/Visual/Tables/TableEditors.java delete mode 100644 src/Common/Visual/Tables/TableRenderers.java delete mode 100644 src/Common/Visual/Trees/TreeRenderers.java rename src/Common/Visual/{UI_.java => UI.java} (85%) rename src/_VisualDVM/GlobalData/RemoteFile/UI/{RemoteFileRenderer.java => RendererTreeRemoteFile.java} (93%) rename src/_VisualDVM/ProjectData/Project/UI/{VersionsTreeCellRenderer.java => RendererProjectVersion.java} (97%) rename src/_VisualDVM/ProjectData/SapforData/Arrays/UI/{RulesTreeCellRenderer.java => RendererTreeRule.java} (93%) create mode 100644 src/_VisualDVM/ProjectData/SapforData/Variants/UI/RendererVariantRank.java delete mode 100644 src/_VisualDVM/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java rename src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/{SapforVersionsTreeCellRenderer.java => RendererTreeSapforVersions.java} (91%) rename src/{Common/Visual/Tables/VectorEditor.java => _VisualDVM/Visual/Tables/EditorFilesHyperlinks.java} (96%) rename src/{Common/Visual/Tables/ConfigurationAutoRenderer.java => _VisualDVM/Visual/Tables/RendererConfigurationAuto.java} (60%) rename src/{Common/Visual/Tables/HyperlinksRenderer.java => _VisualDVM/Visual/Tables/RendererHyperlinks.java} (83%) rename src/{Common/Visual/Tables/ConfigurationAutoSwitcher.java => _VisualDVM/Visual/Tables/SwitcherConfigurationAuto.java} (90%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1bb9c8c5..1db973ae 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,119 +7,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - + + + + + + + + + + + - + + + + + - - - - - - - - - + - - - + + + - - + - - + + + - - - - - - - - + + - - - - - - - - - - - + - - - - - - - - - - + + - - - - + + - + + + + + + - - + + + + + + + + + - + + + + + + + + + + + + + + + - + + - - - - - - - - - - + + + diff --git a/src/Common/Database/SQLITE/SQLiteDatabase.java b/src/Common/Database/SQLITE/SQLiteDatabase.java index ec8b5097..e19c550f 100644 --- a/src/Common/Database/SQLITE/SQLiteDatabase.java +++ b/src/Common/Database/SQLITE/SQLiteDatabase.java @@ -5,7 +5,7 @@ import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTableColumn; import Common.Passes.PassException; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import javafx.util.Pair; import java.io.File; @@ -210,7 +210,7 @@ public abstract class SQLiteDatabase extends Database { protected void insert(DBTable table, DBObject o) throws Exception { PreparedStatement ps = insertStatements.get(table.d); if (ps == null) - UI_.Info("INSERT NULL"); + UI.Info("INSERT NULL"); int i = 1; for (DBTableColumn column : table.columns.values()) { if (!column.AutoIncrement) { @@ -234,7 +234,7 @@ public abstract class SQLiteDatabase extends Database { protected void update(DBTable table, DBObject o) throws Exception { PreparedStatement ps = updateStatements.get(table.d); if (ps == null) - UI_.Info("UPDATE NULL"); + UI.Info("UPDATE NULL"); int i = 1; for (DBTableColumn column : table.columns.values()) { if (!column.AutoIncrement) { diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java index ac74502f..4cae2f6c 100644 --- a/src/Common/Database/Tables/DataSet.java +++ b/src/Common/Database/Tables/DataSet.java @@ -8,7 +8,7 @@ import Common.Visual.DataSetFilter; import Common.Visual.FilterInterface; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnFilter; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DialogFields; import _VisualDVM.Global; @@ -46,7 +46,7 @@ public class DataSet extends DataSetAnchestor { return null; } public void mountUI(JPanel content_in) { - UI_.Clear(content_in); + UI.Clear(content_in); //--> ui_ = createUI(); ui_.setContent(content_in); @@ -150,7 +150,7 @@ public class DataSet extends DataSetAnchestor { return false; } public boolean ShowDeleteObjectDialog(DBObject object) { - return UI_.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)"); + return UI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)"); } public String QName() { return "\"" + Name + "\""; diff --git a/src/Common/MainModule_.java b/src/Common/MainModule_.java index 0c9cef61..480f672f 100644 --- a/src/Common/MainModule_.java +++ b/src/Common/MainModule_.java @@ -30,9 +30,11 @@ public abstract class MainModule_ { //- private void PerformCanNotStart() throws Exception { performCanNotStart(); - if (UI_.isActive()) + if (UI.isActive()) showCanNotStart(); } protected void PerformPreparation() throws Exception { performPreparation(); - if (UI_.isActive()) + if (UI.isActive()) showPreparation(); } private void PerformFinish() throws Exception { performFinish(); //- - if (UI_.isActive()) + if (UI.isActive()) showFinish(); } private void PerformDone() throws Exception { performDone(); //- - if (UI_.isActive()) + if (UI.isActive()) showDone(); } private void PerformFail() throws Exception { performFail(); //- - if (UI_.isActive()) + if (UI.isActive()) showFail(); } //------ @@ -207,7 +207,7 @@ public class Pass { Vector ToPrint = new Vector<>(); createStack_r(ToDo, ToPrint); if (Global.properties.ConfirmPassesStart && !ToPrint.isEmpty() && - !UI_.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint)) + !UI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint)) ) return false; while (ToDo.size() > 1) { if (!ToDo.pop().start()) return false; @@ -218,7 +218,7 @@ public class Pass { //- if (Global.properties.ShowPassesDone && !ToPrint.isEmpty() ) { - UI_.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) + + UI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) + "\nуспешно выполнен(ы)!"); } //- @@ -232,7 +232,7 @@ public class Pass { return false; } public void Interrupt() throws Exception { - UI_.Info("Проход " + Utils_.Brackets(getDescription()) + " не разрешено прерывать."); + UI.Info("Проход " + Utils_.Brackets(getDescription()) + " не разрешено прерывать."); } public boolean needsConfirmations() { return false; @@ -259,10 +259,10 @@ public class Pass { timer.Start(); //-------------------------------> try { - if (UI_.isActive()) FocusBeforeStart(); + if (UI.isActive()) FocusBeforeStart(); if (canStart(args)) { PerformPreparation(); - if (UI_.isActive() && needsAnimation()) { + if (UI.isActive() && needsAnimation()) { animation_sem = new Semaphore(1); animation_sem.acquire(); //--- @@ -343,8 +343,8 @@ public class Pass { " окончен за " + timer.Print() + " состояние " + Utils_.Brackets(state.getDescription()) ); - if (!Log.isEmpty() && UI_.isActive()) - UI_.Error( + if (!Log.isEmpty() && UI.isActive()) + UI.Error( "проход " + Utils_.Brackets(getDescription()) + "\n" + state.getDescription() + "\n\n" + Log.toString()); } @@ -353,7 +353,7 @@ public class Pass { } //-- public void ShowSapforMessage(String message) { - if (UI_.isActive() && form != null) { + if (UI.isActive() && form != null) { String[] data = message.split(":"); switch (data[0]) { case "message_1": diff --git a/src/Common/Utils/Loggable.java b/src/Common/Utils/Loggable.java index 1b4ea8eb..0f387ada 100644 --- a/src/Common/Utils/Loggable.java +++ b/src/Common/Utils/Loggable.java @@ -1,5 +1,5 @@ package Common.Utils; -import Common.Visual.UI_; +import Common.Visual.UI; import java.io.File; import java.io.FileWriter; @@ -34,8 +34,8 @@ public interface Loggable { ex.printStackTrace(writer); writer.flush(); Print(out.toString()); - if (UI_.isActive()) - UI_.Error("Возникло исключение. Подробности в файле журнала\n" + + if (UI.isActive()) + UI.Error("Возникло исключение. Подробности в файле журнала\n" + Utils_.Brackets(getLogFile().getAbsolutePath())); } } diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java index c813e11a..aedcb092 100644 --- a/src/Common/Visual/DataSetControlForm.java +++ b/src/Common/Visual/DataSetControlForm.java @@ -9,6 +9,8 @@ import Common.MainModule_; import Common.Utils.Utils_; import Common.Visual.Menus.TableMenu; import Common.Visual.Tables.ColumnInfo; +import Common.Visual.Tables.DBObjectSelectionRenderer; +import Common.Visual.Tables.DBObjectSelector; import Common.Visual.Tables.DataTable; import Common.Visual.Tables.Grid.GridAnchestor; import _VisualDVM.Global; @@ -23,9 +25,6 @@ import java.util.Arrays; import java.util.Vector; import java.util.stream.Collectors; import java.util.stream.IntStream; - -import static Common.Visual.Tables.TableEditors.EditorSelect; -import static Common.Visual.Tables.TableRenderers.RendererSelect; public class DataSetControlForm extends ControlWithCurrentForm { protected JPanel dataPanel; protected DataSet dataSource; @@ -55,7 +54,7 @@ public class DataSetControlForm extends ControlWithCurrentForm { @Override public void Clear() { super.Clear(); - UI_.Clear(dataPanel); + UI.Clear(dataPanel); } public DataSet getDataSource() { return dataSource; @@ -96,7 +95,7 @@ public class DataSetControlForm extends ControlWithCurrentForm { columns.clear(); columns.add(new ColumnInfo(getDataSource().getPKName())); if (hasCheckBox()) { - columns.add(new ColumnInfo("", RendererSelect, EditorSelect)); + columns.add(new ColumnInfo("", DBObjectSelectionRenderer.class, DBObjectSelector.class)); columns.get(1).setMinWidth(25); columns.get(1).setMaxWidth(25); } @@ -184,9 +183,9 @@ public class DataSetControlForm extends ControlWithCurrentForm { ColumnInfo columnInfo = columns.get(i); if (columnInfo.isVisible()) { if (columnInfo.hasRenderer()) - getColumnModel().getColumn(i).setCellRenderer(MainModule_.instance.getUI().getTableRenderer(columnInfo.getRenderer())); + getColumnModel().getColumn(i).setCellRenderer(MainModule_.instance.getUI().getTableRenderer(columnInfo.getRendererClass())); if (columnInfo.hasEditor()) - getColumnModel().getColumn(i).setCellEditor(MainModule_.instance.getUI().getTableEditor(columnInfo.getEditor())); + getColumnModel().getColumn(i).setCellEditor(MainModule_.instance.getUI().getTableEditor(columnInfo.getEditorClass())); if (columnInfo.hasMaxWidth()) getColumnModel().getColumn((i)).setMaxWidth(columnInfo.getMaxWidth()); if (columnInfo.hasMinWidth()) diff --git a/src/Common/Visual/Menus/FastAccessMenuBar.java b/src/Common/Visual/Menus/FastAccessMenuBar.java index 61e29de1..31250709 100644 --- a/src/Common/Visual/Menus/FastAccessMenuBar.java +++ b/src/Common/Visual/Menus/FastAccessMenuBar.java @@ -1,7 +1,7 @@ package Common.Visual.Menus; import Common.MainModule_; import Common.Passes.Pass; -import Common.Visual.UI_; +import Common.Visual.UI; import javax.swing.*; import java.awt.*; @@ -28,6 +28,6 @@ public class FastAccessMenuBar extends VisualiserMenuBar { } } public void Drop() { - UI_.Clear(this); + UI.Clear(this); } } diff --git a/src/Common/Visual/Menus/TextComboBoxMenu.java b/src/Common/Visual/Menus/TextComboBoxMenu.java index d830de3b..3fa5a8b2 100644 --- a/src/Common/Visual/Menus/TextComboBoxMenu.java +++ b/src/Common/Visual/Menus/TextComboBoxMenu.java @@ -1,6 +1,6 @@ package Common.Visual.Menus; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import javax.swing.*; import java.awt.event.ActionEvent; @@ -27,7 +27,7 @@ public class TextComboBoxMenu extends StyledPopupMenu { new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - UI_.TrySelect(box, Utils_.getFromClipboard()); + UI.TrySelect(box, Utils_.getFromClipboard()); } }); add(m_paste); diff --git a/src/Common/Visual/Tables/ColumnInfo.java b/src/Common/Visual/Tables/ColumnInfo.java index 52fac39b..0eba77ac 100644 --- a/src/Common/Visual/Tables/ColumnInfo.java +++ b/src/Common/Visual/Tables/ColumnInfo.java @@ -4,29 +4,22 @@ public class ColumnInfo { private String Name = "?"; private boolean visible = true; private boolean editable = false; - private TableRenderers renderer = TableRenderers.RendererDefault; - private TableEditors editor = TableEditors.EditorDefault; + private Class rendererClass = null; + private Class editorClass = null; private int maxWidth = CommonConstants.Nan; private int minWidth = CommonConstants.Nan; - //private int lastWidth = Utils.Nan; - // public void setLastWidth(int width_in) { - // lastWidth = width_in; - // } - // public int getLastWidth() { - // return lastWidth; - // } public ColumnInfo(String name_in) { setName(name_in); } - public ColumnInfo(String name_in, TableRenderers renderer_in, TableEditors editor_in) { + public ColumnInfo(String name_in, Class renderer_in, Class editor_in) { setName(name_in); - setRenderer(renderer_in); + setRendererClass(renderer_in); setEditable(true); - setEditor(editor_in); + setEditorClass(editor_in); } - public ColumnInfo(String name_in, TableRenderers renderer_in) { + public ColumnInfo(String name_in, Class renderer_in) { setName(name_in); - setRenderer(renderer_in); + setRendererClass(renderer_in); } public String getName() { return Name; @@ -46,24 +39,24 @@ public class ColumnInfo { public void setEditable(boolean editable_in) { this.editable = editable_in; } - public TableRenderers getRenderer() { - return renderer; + public Class getRendererClass() { + return rendererClass; } - public void setRenderer(TableRenderers renderer_in) { - this.renderer = renderer_in; + public void setRendererClass(Class renderer_in) { + this.rendererClass = renderer_in; } - public TableEditors getEditor() { - return editor; + public Class getEditorClass() { + return editorClass; } - public void setEditor(TableEditors editor_in) { - this.editor = editor_in; - setEditable(editor != TableEditors.EditorDefault); + public void setEditorClass(Class editor_in) { + this.editorClass = editor_in; + setEditable(editorClass != null); } public boolean hasRenderer() { - return getRenderer() != TableRenderers.RendererDefault; + return getRendererClass() != null; } public boolean hasEditor() { - return getEditor() != TableEditors.EditorDefault; + return getEditorClass() != null; } public int getMaxWidth() { return maxWidth; @@ -84,11 +77,4 @@ public class ColumnInfo { public boolean hasMinWidth() { return minWidth != CommonConstants.Nan; } - -/* - public boolean hasLastWidth() { - return lastWidth != Utils.Nan; - } - */ - //- } diff --git a/src/Common/Visual/Tables/DBObjectSelectionRenderer.java b/src/Common/Visual/Tables/DBObjectSelectionRenderer.java index 69764f93..239afdc3 100644 --- a/src/Common/Visual/Tables/DBObjectSelectionRenderer.java +++ b/src/Common/Visual/Tables/DBObjectSelectionRenderer.java @@ -1,5 +1,5 @@ package Common.Visual.Tables; -public class DBObjectSelectionRenderer extends DBObjectRenderer { +public class DBObjectSelectionRenderer extends RendererDBObject { /* @Override public Dimension getMinimumSize() { diff --git a/src/Common/Visual/Tables/DBObjectSelector.java b/src/Common/Visual/Tables/DBObjectSelector.java index a23aa632..63238b50 100644 --- a/src/Common/Visual/Tables/DBObjectSelector.java +++ b/src/Common/Visual/Tables/DBObjectSelector.java @@ -1,6 +1,6 @@ package Common.Visual.Tables; import Common.Database.Objects.DBObject; -public class DBObjectSelector extends DBObjectEditor { +public class DBObjectSelector extends EditorDBObject { @Override public void Action() { value.SwitchSelection(); diff --git a/src/Common/Visual/Tables/DBObjectEditor.java b/src/Common/Visual/Tables/EditorDBObject.java similarity index 98% rename from src/Common/Visual/Tables/DBObjectEditor.java rename to src/Common/Visual/Tables/EditorDBObject.java index 5bff3346..21671c5b 100644 --- a/src/Common/Visual/Tables/DBObjectEditor.java +++ b/src/Common/Visual/Tables/EditorDBObject.java @@ -9,7 +9,7 @@ import javax.swing.table.TableCellEditor; import java.awt.*; import java.util.EventObject; import java.util.Objects; -public abstract class DBObjectEditor extends EditorCell implements TableCellEditor { +public abstract class EditorDBObject extends EditorCell implements TableCellEditor { //задается при редактировании клетки. public T value = null; protected transient ChangeEvent changeEvent; diff --git a/src/Common/Visual/Tables/EditableHeaderRenderer.java b/src/Common/Visual/Tables/RendereEditableHeader.java similarity index 96% rename from src/Common/Visual/Tables/EditableHeaderRenderer.java rename to src/Common/Visual/Tables/RendereEditableHeader.java index 5930560a..5d7f63ef 100644 --- a/src/Common/Visual/Tables/EditableHeaderRenderer.java +++ b/src/Common/Visual/Tables/RendereEditableHeader.java @@ -5,11 +5,11 @@ import javax.swing.table.TableCellRenderer; import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -public class EditableHeaderRenderer implements TableCellRenderer { +public class RendereEditableHeader implements TableCellRenderer { private JTable table = null; private MouseEventReposter reporter = null; private JComponent editor; - public EditableHeaderRenderer(JComponent editor) { + public RendereEditableHeader(JComponent editor) { this.editor = editor; this.editor.setBorder(UIManager.getBorder("TableHeader.cellBorder")); } diff --git a/src/Common/Visual/Tables/DBObjectRenderer.java b/src/Common/Visual/Tables/RendererDBObject.java similarity index 81% rename from src/Common/Visual/Tables/DBObjectRenderer.java rename to src/Common/Visual/Tables/RendererDBObject.java index 8a3fc9ad..32490456 100644 --- a/src/Common/Visual/Tables/DBObjectRenderer.java +++ b/src/Common/Visual/Tables/RendererDBObject.java @@ -3,7 +3,7 @@ import Common.Database.Objects.DBObject; import Common.Visual.DataControl; import javax.swing.*; -public abstract class DBObjectRenderer extends RendererCell { +public abstract class RendererDBObject extends RendererCell { @Override public DBObject Init(JTable table, Object value, int row, int column) { return ((DataControl) table).getRowObject(row); diff --git a/src/Common/Visual/Tables/DateRenderer_.java b/src/Common/Visual/Tables/RendererDate.java similarity index 90% rename from src/Common/Visual/Tables/DateRenderer_.java rename to src/Common/Visual/Tables/RendererDate.java index f28affb4..82f95949 100644 --- a/src/Common/Visual/Tables/DateRenderer_.java +++ b/src/Common/Visual/Tables/RendererDate.java @@ -4,7 +4,7 @@ import Common.Utils.Utils_; import javax.swing.*; import java.util.Date; //название пересекается с встроенным классом поэтому подчеркивание. -public class DateRenderer_ extends RendererCell { +public class RendererDate extends RendererCell { private static final Date zero = new Date(0); @Override public Date Init(JTable table, Object value, int row, int column) { diff --git a/src/Common/Visual/Tables/HiddenListRenderer.java b/src/Common/Visual/Tables/RendererHiddenList.java similarity index 88% rename from src/Common/Visual/Tables/HiddenListRenderer.java rename to src/Common/Visual/Tables/RendererHiddenList.java index 7b440c34..1f018bc2 100644 --- a/src/Common/Visual/Tables/HiddenListRenderer.java +++ b/src/Common/Visual/Tables/RendererHiddenList.java @@ -4,7 +4,7 @@ import Common.Visual.Fonts.VisualiserFonts; import javax.swing.*; import java.util.Vector; -public class HiddenListRenderer extends RendererCell> { +public class RendererHiddenList extends RendererCell> { @Override public Vector Init(JTable table, Object value, int row, int column) { return (Vector) value; diff --git a/src/Common/Visual/Tables/MaskedIntegerValueRenderer.java b/src/Common/Visual/Tables/RendererMaskedNanInteger.java similarity index 86% rename from src/Common/Visual/Tables/MaskedIntegerValueRenderer.java rename to src/Common/Visual/Tables/RendererMaskedNanInteger.java index fb5de590..f7dcfe63 100644 --- a/src/Common/Visual/Tables/MaskedIntegerValueRenderer.java +++ b/src/Common/Visual/Tables/RendererMaskedNanInteger.java @@ -1,6 +1,6 @@ package Common.Visual.Tables; import javax.swing.*; -public class MaskedIntegerValueRenderer extends RendererCell { +public class RendererMaskedNanInteger extends RendererCell { @Override public Long Init(JTable table, Object value, int row, int column) { return (Long) value; diff --git a/src/Common/Visual/Tables/MultilineRenderer.java b/src/Common/Visual/Tables/RendererMultiline.java similarity index 88% rename from src/Common/Visual/Tables/MultilineRenderer.java rename to src/Common/Visual/Tables/RendererMultiline.java index c272efe6..12d3f570 100644 --- a/src/Common/Visual/Tables/MultilineRenderer.java +++ b/src/Common/Visual/Tables/RendererMultiline.java @@ -5,7 +5,7 @@ import javax.swing.*; import javax.swing.table.TableCellRenderer; import java.awt.*; import java.util.Vector; -public class MultilineRenderer extends StyledList implements TableCellRenderer { +public class RendererMultiline extends StyledList implements TableCellRenderer { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { setBackground(isSelected ? table.getSelectionBackground() : table.getBackground()); diff --git a/src/Common/Visual/Tables/ProgressBarRenderer.java b/src/Common/Visual/Tables/RendererProgressBar.java similarity index 88% rename from src/Common/Visual/Tables/ProgressBarRenderer.java rename to src/Common/Visual/Tables/RendererProgressBar.java index c6c49b21..1d239379 100644 --- a/src/Common/Visual/Tables/ProgressBarRenderer.java +++ b/src/Common/Visual/Tables/RendererProgressBar.java @@ -3,7 +3,7 @@ import Common.Visual.Controls.StyledProgressBar; import javax.swing.*; import javax.swing.table.TableCellRenderer; -public class ProgressBarRenderer extends StyledProgressBar implements TableCellRenderer { +public class RendererProgressBar extends StyledProgressBar implements TableCellRenderer { @Override public java.awt.Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { setBackground(isSelected ? table.getSelectionBackground() : table.getBackground()); diff --git a/src/Common/Visual/Tables/StatusEnumRenderer.java b/src/Common/Visual/Tables/RendererStatusEnum.java similarity index 88% rename from src/Common/Visual/Tables/StatusEnumRenderer.java rename to src/Common/Visual/Tables/RendererStatusEnum.java index 46727f36..a6f22fb7 100644 --- a/src/Common/Visual/Tables/StatusEnumRenderer.java +++ b/src/Common/Visual/Tables/RendererStatusEnum.java @@ -3,7 +3,7 @@ import Common.MainModule_; import Common.Visual.StatusEnum; import javax.swing.*; -public class StatusEnumRenderer extends RendererCell { +public class RendererStatusEnum extends RendererCell { @Override public StatusEnum Init(JTable table, Object value, int row, int column) { return (StatusEnum) value; diff --git a/src/Common/Visual/Tables/TopLeftRenderer.java b/src/Common/Visual/Tables/RendererTopLeft.java similarity index 84% rename from src/Common/Visual/Tables/TopLeftRenderer.java rename to src/Common/Visual/Tables/RendererTopLeft.java index 3537d18e..e95ef625 100644 --- a/src/Common/Visual/Tables/TopLeftRenderer.java +++ b/src/Common/Visual/Tables/RendererTopLeft.java @@ -1,6 +1,6 @@ package Common.Visual.Tables; import javax.swing.*; -public class TopLeftRenderer extends RendererCell { +public class RendererTopLeft extends RendererCell { @Override public Object Init(JTable table, Object value, int row, int column) { return value; diff --git a/src/Common/Visual/Tables/WrapTextRenderer.java b/src/Common/Visual/Tables/RendererWrapText.java similarity index 91% rename from src/Common/Visual/Tables/WrapTextRenderer.java rename to src/Common/Visual/Tables/RendererWrapText.java index b85d9902..ed449135 100644 --- a/src/Common/Visual/Tables/WrapTextRenderer.java +++ b/src/Common/Visual/Tables/RendererWrapText.java @@ -5,8 +5,8 @@ import Common.Visual.Fonts.VisualiserFonts; import javax.swing.*; import javax.swing.table.TableCellRenderer; import java.awt.*; -public class WrapTextRenderer extends JTextArea implements TableCellRenderer { - public WrapTextRenderer() { +public class RendererWrapText extends JTextArea implements TableCellRenderer { + public RendererWrapText() { setLineWrap(true); setWrapStyleWord(true); // setOpaque(false); diff --git a/src/Common/Visual/Tables/TableEditors.java b/src/Common/Visual/Tables/TableEditors.java deleted file mode 100644 index ea1878cd..00000000 --- a/src/Common/Visual/Tables/TableEditors.java +++ /dev/null @@ -1,10 +0,0 @@ -package Common.Visual.Tables; -public enum TableEditors { - EditorDefault, - EditorSelect, - EditorHyperlinks, - EditorDimension, - EditorCompilerEnvironmentValue, - EditorCompilerOptionParameterValue, - EditorAutoConfiguration -} diff --git a/src/Common/Visual/Tables/TableRenderers.java b/src/Common/Visual/Tables/TableRenderers.java deleted file mode 100644 index 19cd07ce..00000000 --- a/src/Common/Visual/Tables/TableRenderers.java +++ /dev/null @@ -1,20 +0,0 @@ -package Common.Visual.Tables; -public enum TableRenderers { - RendererDefault, - RendererDate, - RendererProgress, - RendererSelect, - RendererDimension, - RendererMultiline, - RendererHyperlinks, - RendererTopLeft, - RendererMaskedInt, - RendererVariantRank, - RendererHiddenList, - RendererWrapText, - RendererCompilerOptionParameterValue, - RendererCompilerEnvironmentValue, - RendererCompilerOptionParameterName, - RendererStatusEnum, - RendererAutoConfiguration -} diff --git a/src/Common/Visual/Trees/StyledTree.java b/src/Common/Visual/Trees/StyledTree.java index 07ba1719..2226b367 100644 --- a/src/Common/Visual/Trees/StyledTree.java +++ b/src/Common/Visual/Trees/StyledTree.java @@ -24,8 +24,8 @@ public class StyledTree extends JTree implements ThemeElement { setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain)); setToggleClickCount(0); //отключение сворачивание разворачивания по двойному клику //-- - if (!getRenderer().equals(TreeRenderers.RendererUndefined)) - setCellRenderer(MainModule_.instance.getUI().getTreeRenderer(getRenderer())); + if (getRendererClass()!=null) + setCellRenderer(MainModule_.instance.getUI().getTreeRenderer(getRendererClass())); //-- getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); addTreeSelectionListener(e -> { @@ -65,8 +65,8 @@ public class StyledTree extends JTree implements ThemeElement { applyTheme(); ExpandAll(); } - public TreeRenderers getRenderer() { - return TreeRenderers.RendererUndefined; + public Class getRendererClass() { + return null; } public void EventsOn() { events_on = true; diff --git a/src/Common/Visual/Trees/TreeForm.java b/src/Common/Visual/Trees/TreeForm.java index 9a7b2406..674e9cf9 100644 --- a/src/Common/Visual/Trees/TreeForm.java +++ b/src/Common/Visual/Trees/TreeForm.java @@ -1,6 +1,6 @@ package Common.Visual.Trees; import Common.Visual.ControlForm; -import Common.Visual.UI_; +import Common.Visual.UI; import java.awt.*; public class TreeForm extends ControlForm { @@ -25,6 +25,6 @@ public class TreeForm extends ControlForm { @Override public void Clear() { super.Clear(); - UI_.Clear(content); + UI.Clear(content); } } diff --git a/src/Common/Visual/Trees/TreeRenderers.java b/src/Common/Visual/Trees/TreeRenderers.java deleted file mode 100644 index 098a470c..00000000 --- a/src/Common/Visual/Trees/TreeRenderers.java +++ /dev/null @@ -1,13 +0,0 @@ -package Common.Visual.Trees; -public enum TreeRenderers { - RendererUndefined, - //- - RendererGraph, - RendererFile, - RendererRemoteFile, - RendererVersion, - RendererRule, - RendererAttachment, - RendererSapforVersion, - RendererSelection, -} diff --git a/src/Common/Visual/UI_.java b/src/Common/Visual/UI.java similarity index 85% rename from src/Common/Visual/UI_.java rename to src/Common/Visual/UI.java index 05933f55..1331b23d 100644 --- a/src/Common/Visual/UI_.java +++ b/src/Common/Visual/UI.java @@ -5,13 +5,8 @@ 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.*; -public class UI_ { - //-- - 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 class UI { public static boolean active = false; public static boolean isActive() { return active; @@ -55,7 +50,7 @@ public class UI_ { } //Примитивные диалоговые элементы public static boolean Question(Component parent, String text) { - return !UI_.isActive() || (JOptionPane.showConfirmDialog(parent, + return !UI.isActive() || (JOptionPane.showConfirmDialog(parent, text + "?", "Подтверждение", JOptionPane.YES_NO_OPTION, @@ -66,16 +61,16 @@ public class UI_ { } public static void Info(String message) { Utils_.CopyToClipboard(message); - if (UI_.isActive()) + if (UI.isActive()) JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 1); } public static void Error(String message) { Utils_.CopyToClipboard(message); - if (UI_.isActive()) + if (UI.isActive()) JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 0); } public static boolean Warning(String text) { - return !UI_.isActive() || + return !UI.isActive() || JOptionPane.showConfirmDialog(MainModule_.instance.getUI().getFrontWindow(), text + "\nВы уверены?", "Подтверждение", diff --git a/src/Common/Visual/UIModule_.java b/src/Common/Visual/UIModule_.java index becbb7c6..ee2319d4 100644 --- a/src/Common/Visual/UIModule_.java +++ b/src/Common/Visual/UIModule_.java @@ -2,10 +2,8 @@ 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 javax.swing.*; @@ -16,15 +14,12 @@ 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, DataMenuBar> menuBars = new LinkedHashMap<>(); public Stack windowsStack = new Stack<>(); - protected LinkedHashMap tableRenderers = new LinkedHashMap<>(); - protected LinkedHashMap tableEditors = new LinkedHashMap<>(); - protected LinkedHashMap treeRenderers = new LinkedHashMap<>(); + protected LinkedHashMap tableRenderers = new LinkedHashMap<>(); + protected LinkedHashMap tableEditors = new LinkedHashMap<>(); + protected LinkedHashMap treeRenderers = new LinkedHashMap<>(); //-- VisualiserTheme theme = new DefaultTheme(); FastAccessMenuBar fastAccessMenuBar = new FastAccessMenuBar(); @@ -62,20 +57,6 @@ public class UIModule_ { UIManager.put("OptionPane.cancelButtonText", "Отмена"); UIManager.put("OptionPane.okButtonText", "Готово"); // - 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() { @@ -108,13 +89,49 @@ public class UIModule_ { } return res; } - public TableCellRenderer getTableRenderer(Common.Visual.Tables.TableRenderers r_name) { - return tableRenderers.get(r_name); + public TableCellRenderer getTableRenderer(Class key) { + TableCellRenderer res = null; + if (tableRenderers.containsKey(key)) + res= tableRenderers.get(key); + else { + try { + res = (TableCellRenderer) key.newInstance(); + } + catch (Exception ex){ + ex.printStackTrace(); + } + tableRenderers.put(key,res); + } + return res; } - public TableCellEditor getTableEditor(Common.Visual.Tables.TableEditors e_name) { - return tableEditors.get(e_name); + public TableCellEditor getTableEditor(Class key) { + TableCellEditor res = null; + if (tableEditors.containsKey(key)) + res= tableEditors.get(key); + else { + try { + res = (TableCellEditor) key.newInstance(); + } + catch (Exception ex){ + ex.printStackTrace(); + } + tableEditors.put(key,res); + } + return res; } - public TreeCellRenderer getTreeRenderer(Common.Visual.Trees.TreeRenderers r_name) { - return treeRenderers.get(r_name); + public TreeCellRenderer getTreeRenderer(Class key) { + TreeCellRenderer res = null; + if (treeRenderers.containsKey(key)) + res= treeRenderers.get(key); + else { + try { + res = (TreeCellRenderer) key.newInstance(); + } + catch (Exception ex){ + ex.printStackTrace(); + } + treeRenderers.put(key,res); + } + return res; } } diff --git a/src/Common/Visual/Windows/Dialog/Dialog.java b/src/Common/Visual/Windows/Dialog/Dialog.java index 46c795c4..d7db7ae9 100644 --- a/src/Common/Visual/Windows/Dialog/Dialog.java +++ b/src/Common/Visual/Windows/Dialog/Dialog.java @@ -4,7 +4,7 @@ import Common.Utils.TextLog; import Common.Utils.Utils_; import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Themes.ThemeElement; -import Common.Visual.UI_; +import Common.Visual.UI; import javax.swing.*; import java.awt.*; @@ -137,7 +137,7 @@ public class Dialog extends JDialog implements ThemeE OK = true; CloseAction(); } else - UI_.Error("Валидация не пройдена:\n" + Log.toString()); + UI.Error("Валидация не пройдена:\n" + Log.toString()); } protected void onCancel() { CloseAction(); diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java index c1cd8656..c46a59af 100644 --- a/src/_VisualDVM/Global.java +++ b/src/_VisualDVM/Global.java @@ -2,7 +2,7 @@ package _VisualDVM; import Common.Database.Tables.DataSet; import Common.Utils.Loggable; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.GlobalData.Settings.DBSetting; @@ -221,9 +221,9 @@ public class Global { //-- public static void NormalMode(int port) throws Exception { //-------------------------------->> - UI_.active = true; + UI.active = true; mainModule = new MainModule(); - mainModule.CreateAll(); + mainModule.Init(); //-- CheckVisualiserDirectories(); CreateLogAtComponentsPath(); @@ -233,7 +233,7 @@ public class Global { visualizer_2.refreshPid(); //если делать раньше, то не удастся убить сервер. if (Utils_.ContainsCyrillic(Utils_.getHomePath())) { - UI_.Info("В пути к корневой папке " + Utils_.DQuotes(Utils_.getHomePath()) + "\n" + + UI.Info("В пути к корневой папке " + Utils_.DQuotes(Utils_.getHomePath()) + "\n" + "Найдены русские буквы.\n" + "Визуализатор завершает работу."); // FinishApplication(); @@ -265,10 +265,10 @@ public class Global { do { Global.mainModule.getUI().getComponentsWindow().ShowDialog(""); if (flag = (!ValidateComponentsStates())) { - if (!UI_.Question("Найдено " + bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" + + if (!UI.Question("Найдено " + bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" + "Вернуться к окну компонент" )) { - UI_.Info("Визуализатор завершает работу."); + UI.Info("Визуализатор завершает работу."); FinishApplication(); } } diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java index 7af01135..a3ef35c4 100644 --- a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java +++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java @@ -6,7 +6,7 @@ import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.iDBTable; import Common.Utils.Utils_; import Common.Visual.DataSetControlForm; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Current; import _VisualDVM.Global; @@ -96,7 +96,7 @@ public class CompilersDBTable extends iDBTable { fields.tfHelpCommand.setText(Result.help_command); fields.tfVersionCommand.setText(Result.version_command); fields.tfHome.setText(Result.home_path); - UI_.TrySelect(fields.cbCompilerType, Result.type); + UI.TrySelect(fields.cbCompilerType, Result.type); fields.events_on = true; } @Override diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java index d9ea32d1..befa0719 100644 --- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java +++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java @@ -1,6 +1,6 @@ package _VisualDVM.GlobalData.Compiler.UI; import Common.Visual.TextField.StyledTextField; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.VDirectoryChooser; import _VisualDVM.Global; @@ -41,7 +41,7 @@ public class CompilerFields implements DialogFields { if (dst != null) tfHome.setText(dst); } else - UI_.Info("Назначение домашней папки поддерживается только для dvm системы."); + UI.Info("Назначение домашней папки поддерживается только для dvm системы."); }); tfHome.getDocument().addDocumentListener(new DocumentListener() { @Override diff --git a/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java b/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java index cf2b79b5..58ec4f9e 100644 --- a/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java +++ b/src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java @@ -1,10 +1,9 @@ package _VisualDVM.GlobalData.CompilerEnvironment; import Common.Database.Tables.DataSet; import Common.Visual.DataSetControlForm; -import Common.Visual.Tables.TableEditors; -import Common.Visual.Tables.TableRenderers; - -import static Common.Visual.Tables.TableRenderers.RendererMultiline; +import Common.Visual.Tables.RendererMultiline; +import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor; +import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer; public class CompilerEnvironmentsSet extends DataSet { public CompilerEnvironmentsSet() { super(String.class, CompilerEnvironment.class); @@ -35,10 +34,10 @@ public class CompilerEnvironmentsSet extends DataSet { +public class CompilerEnvironmentValueEditor extends EditorDBObject { @Override public void Action() { setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink)); @@ -21,7 +21,7 @@ public class CompilerEnvironmentValueEditor extends DBObjectEditor { public CompilerOptionsSet() { super(String.class, CompilerOption.class); @@ -37,10 +36,10 @@ public class CompilerOptionsSet extends DataSet { } @Override protected void AdditionalInitColumns() { - columns.get(2).setRenderer(TableRenderers.RendererCompilerOptionParameterName); - columns.get(3).setRenderer(TableRenderers.RendererCompilerOptionParameterValue); - columns.get(3).setEditor(TableEditors.EditorCompilerOptionParameterValue); - columns.get(4).setRenderer(RendererMultiline); + columns.get(2).setRendererClass( CompilerOptionParameterNameRenderer.class); + columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class); + columns.get(3).setEditorClass(CompilerOptionParameterValueRenderer.class); + columns.get(4).setRendererClass(RendererMultiline.class); } }; } diff --git a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java index 41cb4f2b..e4b2c7b1 100644 --- a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java +++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java @@ -1,9 +1,9 @@ package _VisualDVM.GlobalData.CompilerOption.UI; import Common.MainModule_; import Common.Visual.Fonts.VisualiserFonts; -import Common.Visual.Tables.DBObjectRenderer; +import Common.Visual.Tables.RendererDBObject; import _VisualDVM.GlobalData.CompilerOption.CompilerOption; -public class CompilerOptionParameterNameRenderer extends DBObjectRenderer { +public class CompilerOptionParameterNameRenderer extends RendererDBObject { @Override public void Display() { if (value != null) { diff --git a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java index 05b32065..4b872cb3 100644 --- a/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java +++ b/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java @@ -1,11 +1,11 @@ package _VisualDVM.GlobalData.CompilerOption.UI; import Common.MainModule_; import Common.Visual.Fonts.VisualiserFonts; -import Common.Visual.Tables.DBObjectEditor; -import Common.Visual.UI_; +import Common.Visual.Tables.EditorDBObject; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.Text.ComboTextDialog; import _VisualDVM.GlobalData.CompilerOption.CompilerOption; -public class CompilerOptionParameterValueEditor extends DBObjectEditor { +public class CompilerOptionParameterValueEditor extends EditorDBObject { @Override public void Action() { if (value.hasParameter()) { @@ -15,7 +15,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor { return new DBObjectDialog(DVMParameterFields.class) { @Override public void fillFields() { - UI_.TrySelect(fields.cbName, Result.name); + UI.TrySelect(fields.cbName, Result.name); fields.tfValue.setText(Result.value); } //https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java index f995abc8..4ae420f7 100644 --- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java +++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java @@ -2,7 +2,7 @@ package _VisualDVM.GlobalData.EnvironmentValue; import Common.Database.Tables.iDBTable; import Common.Utils.Utils_; import Common.Visual.DataSetControlForm; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Current; import _VisualDVM.Global; @@ -25,7 +25,7 @@ public class EnvironmentValuesDBTable extends iDBTable { return new DBObjectDialog(EnvironmentValueFields.class) { @Override public void fillFields() { - UI_.TrySelect(fields.cbName, Result.name); + UI.TrySelect(fields.cbName, Result.name); fields.tfValue.setText(Result.value); } //https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java diff --git a/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java b/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java index 7e80c4c1..22ddda18 100644 --- a/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java +++ b/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java @@ -1,8 +1,7 @@ package _VisualDVM.GlobalData.FileObject; import Common.Database.Tables.DataSet; import Common.Visual.DataSetControlForm; - -import static Common.Visual.Tables.TableRenderers.RendererDate; +import Common.Visual.Tables.RendererDate; public class DirInfosDataSet extends DataSet { public DirInfosDataSet() { super(String.class, DirInfo.class); @@ -12,7 +11,7 @@ public class DirInfosDataSet extends DataSet { return new DataSetControlForm(this) { @Override protected void AdditionalInitColumns() { - columns.get(1).setRenderer(RendererDate); + columns.get(1).setRendererClass(RendererDate.class); } }; } diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java index 6df80265..d174191c 100644 --- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java +++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java @@ -5,7 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Current; import _VisualDVM.Global; @@ -50,7 +50,7 @@ public class MachinesDBTable extends iDBTable { fields.tfName.setText(Result.name); fields.tfAddress.setText(Result.address); fields.sPort.setValue(Result.port); - UI_.TrySelect(fields.cbMachineType, Result.type); + UI.TrySelect(fields.cbMachineType, Result.type); } @Override public void ProcessResult() { diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java index a8fe1697..a1e194c9 100644 --- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java +++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java @@ -1,7 +1,7 @@ package _VisualDVM.GlobalData.Module.UI; import Common.Passes.Pass; import Common.Visual.Controls.StyledTextComboBox; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DialogFields; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; @@ -32,14 +32,14 @@ public class ModuleAnchestorFields implements DialogFields { bHelp.addActionListener(e -> { if (cbCompilers.getSelectedItem() != null) { Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, true); - } else UI_.Info("Компилятор не выбран"); + } else UI.Info("Компилятор не выбран"); }); BPickOptions.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions); if (pass.Do(compiler)) { - UI_.TrySelect(cbFlags, pass.target); + UI.TrySelect(cbFlags, pass.target); } } }); @@ -58,7 +58,7 @@ public class ModuleAnchestorFields implements DialogFields { cbCompilers.addActionListener(e -> { if (cbCompilers.getSelectedItem() instanceof Compiler) { Compiler compiler = ((Compiler) cbCompilers.getSelectedItem()); - UI_.TrySelect(cbCommands, + UI.TrySelect(cbCommands, linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName)); } }); diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java index 599a7df8..3139475b 100644 --- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java +++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java @@ -1,6 +1,6 @@ package _VisualDVM.GlobalData.Module.UI; import Common.CommonConstants; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; @@ -93,9 +93,9 @@ public class ModuleAnchestorForm extends DBObjectDial } @Override public void fillFields() { - UI_.TrySelect(fields.cbFlags, Result.flags); - UI_.TrySelect(fields.cbCommands, Result.command); - UI_.TrySelect(fields.cbCompilers, Result.getCompiler()); + UI.TrySelect(fields.cbFlags, Result.flags); + UI.TrySelect(fields.cbCommands, Result.command); + UI.TrySelect(fields.cbCompilers, Result.getCompiler()); //-------------------------------------------- fields.setListeners(Result); } diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java index f17162d2..81955435 100644 --- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java +++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java @@ -1,6 +1,6 @@ package _VisualDVM.GlobalData.RemoteFile.UI; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.Dialog; import _VisualDVM.Current; import _VisualDVM.Global; @@ -84,7 +84,7 @@ public class RemoteFileChooser extends Dialog { public void goUp() { if (!root_file.full_name.equals("/")) { Refresh(root_file.parent); - } else UI_.Info("Корневая папка файловой системы достигнута."); + } else UI.Info("Корневая папка файловой системы достигнута."); } @Override public void validateFields() { diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java index 18c20cd2..8f1c3c8a 100644 --- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java +++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java @@ -1,6 +1,5 @@ package _VisualDVM.GlobalData.RemoteFile.UI; import Common.Visual.Trees.DataTree; -import Common.Visual.Trees.TreeRenderers; import _VisualDVM.Current; import _VisualDVM.Global; public class RemoteFilesTree extends DataTree { @@ -8,8 +7,8 @@ public class RemoteFilesTree extends DataTree { super(Global.mainModule.getUI().getRemoteFileChooser().root); } @Override - public TreeRenderers getRenderer() { - return TreeRenderers.RendererRemoteFile; + public Class getRendererClass() { + return RendererTreeRemoteFile.class; } @Override public Current getCurrent() { diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RendererTreeRemoteFile.java similarity index 93% rename from src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java rename to src/_VisualDVM/GlobalData/RemoteFile/UI/RendererTreeRemoteFile.java index bc23b5b1..f5dffcfc 100644 --- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java +++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RendererTreeRemoteFile.java @@ -6,7 +6,7 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; -public class RemoteFileRenderer extends StyledTreeCellRenderer { +public class RendererTreeRemoteFile extends StyledTreeCellRenderer { public java.awt.Component getTreeCellRendererComponent( JTree tree, Object value, boolean selected, boolean expanded, diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java index 46144dac..b65ab27b 100644 --- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java +++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java @@ -6,7 +6,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Current; import _VisualDVM.Global; @@ -43,14 +43,14 @@ public class RunConfigurationsDBTable extends iDBTable { if (compiler.isVisible() && compiler.type.equals(CompilerType.dvm)) fields.cbLauncherCall.addItem(compiler); } - UI_.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall); - UI_.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions); + UI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall); + UI.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions); fields.tfArgs.setText(Result.args); fields.cbLauncherCall.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) { - UI_.TrySelect(fields.cbLaunchOptions, "run"); + UI.TrySelect(fields.cbLaunchOptions, "run"); } } }); diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java index 841dbf05..1586e4da 100644 --- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java +++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java @@ -6,6 +6,8 @@ import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Menus.TableMenu; +import Common.Visual.Tables.RendererDate; +import Common.Visual.Tables.RendererStatusEnum; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; @@ -13,8 +15,6 @@ import _VisualDVM.Passes.PassCode; import java.util.LinkedHashMap; -import static Common.Visual.Tables.TableRenderers.RendererDate; -import static Common.Visual.Tables.TableRenderers.RendererStatusEnum; public class CompilationTasksDBTable extends iDBTable { public CompilationTasksDBTable() { super(CompilationTask.class); @@ -42,8 +42,8 @@ public class CompilationTasksDBTable extends iDBTable { } @Override protected void AdditionalInitColumns() { - columns.get(12).setRenderer(RendererDate); - columns.get(13).setRenderer(RendererStatusEnum); + columns.get(12).setRendererClass(RendererDate.class); + columns.get(13).setRendererClass(RendererStatusEnum.class); } @Override public void ShowCurrentObject() throws Exception { diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java index 452c0196..80207ec4 100644 --- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java +++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java @@ -2,12 +2,12 @@ package _VisualDVM.GlobalData.Tasks.RunTask; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Menus.TableMenu; +import Common.Visual.Tables.RendererDate; +import Common.Visual.Tables.RendererStatusEnum; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import static Common.Visual.Tables.TableRenderers.RendererDate; -import static Common.Visual.Tables.TableRenderers.RendererStatusEnum; public class RunTasksDBTable extends iDBTable { public RunTasksDBTable() { super(RunTask.class); @@ -29,8 +29,8 @@ public class RunTasksDBTable extends iDBTable { } @Override protected void AdditionalInitColumns() { - columns.get(6).setRenderer(RendererDate); - columns.get(7).setRenderer(RendererStatusEnum); + columns.get(6).setRendererClass(RendererDate.class); + columns.get(7).setRendererClass(RendererStatusEnum.class); } @Override public void ShowCurrentObject() throws Exception { diff --git a/src/_VisualDVM/GlobalData/User/UsersDBTable.java b/src/_VisualDVM/GlobalData/User/UsersDBTable.java index 9fb77d2a..953131f2 100644 --- a/src/_VisualDVM/GlobalData/User/UsersDBTable.java +++ b/src/_VisualDVM/GlobalData/User/UsersDBTable.java @@ -5,7 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; -import Common.Visual.Tables.TableRenderers; +import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Current; import _VisualDVM.Global; @@ -75,7 +75,7 @@ public class UsersDBTable extends iDBTable { @Override protected void AdditionalInitColumns() { columns.get(0).setVisible(false); - columns.get(2).setRenderer(TableRenderers.RendererStatusEnum); + columns.get(2).setRendererClass(RendererStatusEnum.class); } @Override public void ShowCurrentObject() throws Exception { diff --git a/src/_VisualDVM/Passes/All/AddBugReport.java b/src/_VisualDVM/Passes/All/AddBugReport.java index f5d96799..15ec1077 100644 --- a/src/_VisualDVM/Passes/All/AddBugReport.java +++ b/src/_VisualDVM/Passes/All/AddBugReport.java @@ -2,7 +2,7 @@ package _VisualDVM.Passes.All; import Common.Database.Database; import Common.Passes.AddObjectPass; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.Passes.PassCode; @@ -38,7 +38,7 @@ public class AddBugReport extends AddObjectPass { "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'", version); return true; } else { - if (UI_.Warning("Создать отчёт об ошибке без прикрепления проекта.")) { + if (UI.Warning("Создать отчёт об ошибке без прикрепления проекта.")) { target = new BugReport(); target.genName(); target.sender_name = Global.mainModule.getAccount().name; diff --git a/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java b/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java index 2e19acb5..9031f1ad 100644 --- a/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java +++ b/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask; @@ -24,7 +24,7 @@ public class CompareDVMRunTasks extends Pass> { //-- target = Global.testingServer.db.dvmRunTasks.getCheckedItems(); if (target.size() == 2) { - if (UI_.Question("Назначить задачу " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" + + if (UI.Question("Назначить задачу " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" + "\n(в случае отказа, будет назначена задача " + Utils_.Brackets(target.get(1).getPK()) + ")")) { master = target.get(0); slave = target.get(1); @@ -36,11 +36,11 @@ public class CompareDVMRunTasks extends Pass> { } else if (target.size() == 1) { master = target.get(0); slave = null; - return UI_.Question("Отобразить задачу " + Utils_.Brackets(master.getPK())); + return UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK())); } else if ((target.size() == 0) && (Global.mainModule.HasDVMRunTask())) { master = Global.mainModule.getDVMRunTask(); slave = null; - return UI_.Question("Отобразить задачу " + Utils_.Brackets(master.getPK())); + return UI.Question("Отобразить задачу " + Utils_.Brackets(master.getPK())); } else { Log.Writeln_("Для сравнения требуется отметить две задачи.\nДля отображения требуется отметить одну задачу,или выделить её."); return false; diff --git a/src/_VisualDVM/Passes/All/CompareSapforPackages.java b/src/_VisualDVM/Passes/All/CompareSapforPackages.java index d19cf22e..4c2f7f4f 100644 --- a/src/_VisualDVM/Passes/All/CompareSapforPackages.java +++ b/src/_VisualDVM/Passes/All/CompareSapforPackages.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; @@ -24,7 +24,7 @@ public class CompareSapforPackages extends Pass> { //-- target = Global.testingServer.db.sapforPackages.getCheckedItems(); if (target.size() == 2) { - if (UI_.Question("Назначить пакет " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" + + if (UI.Question("Назначить пакет " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" + "\n(в случае отказа, будет назначен пакет " + Utils_.Brackets(target.get(1).getPK()) + ")")) { master = target.get(0); slave = target.get(1); @@ -36,11 +36,11 @@ public class CompareSapforPackages extends Pass> { } else if (target.size() == 1) { master = target.get(0); slave = null; - return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK())); + return UI.Question("Отобразить пакет " + Utils_.Brackets(master.getPK())); } else if ((target.size() == 0) && (Global.mainModule.HasSapforPackage())) { master = Global.mainModule.getSapforPackage(); slave = null; - return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK())); + return UI.Question("Отобразить пакет " + Utils_.Brackets(master.getPK())); } else { Log.Writeln_("Для сравнения требуется отметить два пакета.\nДля отображения требуется отметить один пакет,или выделить его"); return false; diff --git a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java index c6ae483e..b1c94032 100644 --- a/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java +++ b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java @@ -1,5 +1,5 @@ package _VisualDVM.Passes.All; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -30,7 +30,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass { if (!Global.mainModule.Check(Log, Current.ServerSapfor)) { return false; } - return UI_.Warning("Загрузить полный пакет DVM тестов на корректность и производительность."); + return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность."); } @Override protected boolean needsAnimation() { diff --git a/src/_VisualDVM/Passes/All/CopyProject.java b/src/_VisualDVM/Passes/All/CopyProject.java index 77755ddf..18fbea60 100644 --- a/src/_VisualDVM/Passes/All/CopyProject.java +++ b/src/_VisualDVM/Passes/All/CopyProject.java @@ -1,6 +1,6 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.Dialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -62,7 +62,7 @@ public class CopyProject extends CurrentProjectPass { } @Override protected void performDone() throws Exception { - if (UI_.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) { + if (UI.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) { Global.mainModule.getPass(PassCode.CloseCurrentProject).Do(); Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(dstFile); } diff --git a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java index a13cd945..7ff50da6 100644 --- a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java +++ b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -46,7 +46,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests { return false; } //--- - return UI_.Question("В группу " + Utils_.Brackets(group.description) + + return UI.Question("В группу " + Utils_.Brackets(group.description) + "\nбудет добавлено " + target.size() + " тестов.\nПродолжить"); } } diff --git a/src/_VisualDVM/Passes/All/DVMConvertProject.java b/src/_VisualDVM/Passes/All/DVMConvertProject.java index 87509f45..fa5f66d4 100644 --- a/src/_VisualDVM/Passes/All/DVMConvertProject.java +++ b/src/_VisualDVM/Passes/All/DVMConvertProject.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.Controls.PassMenuItem; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; @@ -139,7 +139,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass Global.mainModule.getFile().form.FocusCompilationOut(); } if (!badFiles.isEmpty()) - UI_.Error(badFiles); + UI.Error(badFiles); } @Override protected void performDone() throws Exception { diff --git a/src/_VisualDVM/Passes/All/DeleteDirectory.java b/src/_VisualDVM/Passes/All/DeleteDirectory.java index afd1df39..78c459d2 100644 --- a/src/_VisualDVM/Passes/All/DeleteDirectory.java +++ b/src/_VisualDVM/Passes/All/DeleteDirectory.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.PassException; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -27,7 +27,7 @@ public class DeleteDirectory extends ChangeFilePass { Log.Writeln("Нельзя удалять домашнюю папку проекта."); return false; } - return (UI_.Warning("Удалить папку\n" + Utils_.Brackets(target_dir.getAbsolutePath()) + return (UI.Warning("Удалить папку\n" + Utils_.Brackets(target_dir.getAbsolutePath()) + "\n и всё её содержимое.")); } else Log.Writeln_("Папка не выделена."); return false; diff --git a/src/_VisualDVM/Passes/All/DeleteFile.java b/src/_VisualDVM/Passes/All/DeleteFile.java index 1f296963..556fe0d5 100644 --- a/src/_VisualDVM/Passes/All/DeleteFile.java +++ b/src/_VisualDVM/Passes/All/DeleteFile.java @@ -1,6 +1,6 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -15,7 +15,7 @@ public class DeleteFile extends ChangeFilePass { protected boolean canStart(Object... args) { resetArgs(); return (Global.mainModule.Check(Log, Current.SelectedFile)) && - UI_.Warning("Удалить файл " + UI.Warning("Удалить файл " + Utils_.Brackets((target = Global.mainModule.getSelectedFile()).name)); } @Override diff --git a/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java b/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java index 31cdc05d..addd93c3 100644 --- a/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java +++ b/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -17,7 +17,7 @@ public class DeleteSelectedFiles extends Pass { Log.Writeln_("Не отмечено ни одного файла."); return false; } - return UI_.Warning("Удалить " + Global.mainModule.getProject().db.files.getCheckedCount() + " файлов."); + return UI.Warning("Удалить " + Global.mainModule.getProject().db.files.getCheckedCount() + " файлов."); } @Override protected void performPreparation() throws Exception { diff --git a/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java b/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java index 790574f2..8bfc4bad 100644 --- a/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java +++ b/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java @@ -1,6 +1,6 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -44,7 +44,7 @@ public class DeleteSelectedVersions extends Pass> { } } } - return UI_.Warning("Удалить " + q + " версий."); + return UI.Warning("Удалить " + q + " версий."); } @Override protected void body() throws Exception { diff --git a/src/_VisualDVM/Passes/All/DeleteVersion.java b/src/_VisualDVM/Passes/All/DeleteVersion.java index 7638ffab..899ed5cc 100644 --- a/src/_VisualDVM/Passes/All/DeleteVersion.java +++ b/src/_VisualDVM/Passes/All/DeleteVersion.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -20,8 +20,8 @@ public class DeleteVersion extends Pass { current = (Global.mainModule.getVersion() != null) && Global.mainModule.getVersion().Home.equals(target.Home); return true; } else { - if (((target = Global.mainModule.getVersion()) != null) && (!UI_.isActive() || - UI_.Warning("Удалить " + + if (((target = Global.mainModule.getVersion()) != null) && (!UI.isActive() || + UI.Warning("Удалить " + ((Global.mainModule.HasProject() && target.Home.equals(Global.mainModule.getProject().Home)) ? "текущий проект" : "версию ") + Utils_.Brackets(target.name)))) { current = true; @@ -38,7 +38,7 @@ public class DeleteVersion extends Pass { if ((Global.mainModule.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath()))) Global.mainModule.getPass(PassCode.CloseCurrentProject).Do(); } - if (UI_.isActive()) { + if (UI.isActive()) { Global.mainModule.getUI().getVersionsWindow().RemoveVersionFromComparison(target); } } diff --git a/src/_VisualDVM/Passes/All/DownloadProject.java b/src/_VisualDVM/Passes/All/DownloadProject.java index bf60447f..7b132e39 100644 --- a/src/_VisualDVM/Passes/All/DownloadProject.java +++ b/src/_VisualDVM/Passes/All/DownloadProject.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.PassException; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; @@ -53,7 +53,7 @@ public class DownloadProject extends CurrentConnectionPass { File project = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), Utils_.getDateName(src.name)).toFile(); if (Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) { - if (UI_.Question("Проект " + Utils_.Brackets(src.name) + " успешно загружен. Открыть его")) + if (UI.Question("Проект " + Utils_.Brackets(src.name) + " успешно загружен. Открыть его")) Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(project); } } diff --git a/src/_VisualDVM/Passes/All/DownloadTest.java b/src/_VisualDVM/Passes/All/DownloadTest.java index bbf2a423..c653ad93 100644 --- a/src/_VisualDVM/Passes/All/DownloadTest.java +++ b/src/_VisualDVM/Passes/All/DownloadTest.java @@ -1,6 +1,6 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -48,7 +48,7 @@ public class DownloadTest extends TestingSystemPass { target.getArchive().getAbsolutePath(), Global.visualiser.getWorkspace().getAbsolutePath(), false )) - if (UI_.Question("Тестовый проект успешно загружен под именем\n" + + if (UI.Question("Тестовый проект успешно загружен под именем\n" + Utils_.Brackets(target.getHomePath().getName()) + "\nОткрыть его")) Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(target.getHomePath()); diff --git a/src/_VisualDVM/Passes/All/EditAccount.java b/src/_VisualDVM/Passes/All/EditAccount.java index 8ee52249..0770c9e2 100644 --- a/src/_VisualDVM/Passes/All/EditAccount.java +++ b/src/_VisualDVM/Passes/All/EditAccount.java @@ -1,6 +1,6 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Subscribes.Subscriber; @@ -46,13 +46,13 @@ public class EditAccount extends Email { JOptionPane.INFORMATION_MESSAGE); if (attempt != null) { if (attempt.equals(password)) { - UI_.Info("Почта успешно подтверждена!"); + UI.Info("Почта успешно подтверждена!"); return true; } else { - UI_.Error("Неверный код активации.\nПовторите попытку."); + UI.Error("Неверный код активации.\nПовторите попытку."); } } else { - UI_.Info("Подтверждение почты отменено"); + UI.Info("Подтверждение почты отменено"); return false; } } while (true); diff --git a/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java b/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java index 4fa73af9..f6ef5f35 100644 --- a/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java +++ b/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java @@ -2,7 +2,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Index; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.VDirectoryChooser; import _VisualDVM.Constants; import _VisualDVM.Current; @@ -395,7 +395,7 @@ public class ExportDVMPackageToExcel extends Pass> { protected void performDone() throws Exception { super.performDone(); if (Desktop.isDesktopSupported()) { - if (UI_.Question("Таблица сформирована в файле\n" + Utils_.DQuotes(res.getAbsolutePath()) + ".\nОткрыть её" + if (UI.Question("Таблица сформирована в файле\n" + Utils_.DQuotes(res.getAbsolutePath()) + ".\nОткрыть её" )) { Desktop.getDesktop().open(res); } diff --git a/src/_VisualDVM/Passes/All/GenerateParallelVariants.java b/src/_VisualDVM/Passes/All/GenerateParallelVariants.java index a9a44af7..3fe28408 100644 --- a/src/_VisualDVM/Passes/All/GenerateParallelVariants.java +++ b/src/_VisualDVM/Passes/All/GenerateParallelVariants.java @@ -1,5 +1,5 @@ package _VisualDVM.Passes.All; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Project.CurrentProjectPass; @@ -28,7 +28,7 @@ public class GenerateParallelVariants extends CurrentProjectPass { Log.Writeln_("Количество вариантов " + amount + "\nпревышает 1600. Отображение запрещено."); return false; } - return UI_.Question("Будет отображено " + amount + " вариантов. Хотите продолжить"); + return UI.Question("Будет отображено " + amount + " вариантов. Хотите продолжить"); } return false; } diff --git a/src/_VisualDVM/Passes/All/Precompilation.java b/src/_VisualDVM/Passes/All/Precompilation.java index 1554f867..18427ff6 100644 --- a/src/_VisualDVM/Passes/All/Precompilation.java +++ b/src/_VisualDVM/Passes/All/Precompilation.java @@ -3,7 +3,7 @@ import Common.CommonConstants; import Common.Passes.Pass; import Common.Passes.PassException; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; @@ -252,7 +252,7 @@ public class Precompilation extends Pass { killer.waitFor(); } } else { - UI_.Info("Прерывание процессов под Linux не реализовано"); + UI.Info("Прерывание процессов под Linux не реализовано"); } } } diff --git a/src/_VisualDVM/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java index 65dd0d5c..87230e89 100644 --- a/src/_VisualDVM/Passes/All/PublishBugReport.java +++ b/src/_VisualDVM/Passes/All/PublishBugReport.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -31,7 +31,7 @@ public class PublishBugReport extends Pass { } if (target.executor.isEmpty()) { Global.mainModule.getUI().getMainWindow().getCallbackWindow().FocusRecipients(); - if (!UI_.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его")) + if (!UI.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его")) return false; } if (!Global.mainModule.getAccount().CheckAccessRights(target.sender_address, Log) && (BugReportInterface.CheckDraft(target, Log))) { diff --git a/src/_VisualDVM/Passes/All/PublishTests.java b/src/_VisualDVM/Passes/All/PublishTests.java index 05949381..09ad7351 100644 --- a/src/_VisualDVM/Passes/All/PublishTests.java +++ b/src/_VisualDVM/Passes/All/PublishTests.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Server.TestingSystemPass; @@ -70,7 +70,7 @@ public abstract class PublishTests extends TestingSystemPass> { return false; } //--- - return UI_.Question("В группу " + Utils_.Brackets(group.description) + + return UI.Question("В группу " + Utils_.Brackets(group.description) + "\nбудет добавлено " + target.size() + " тестов.\nПродолжить"); } } diff --git a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java index 135fa554..0763094e 100644 --- a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java +++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.VFileChooser; import _VisualDVM.Constants; import _VisualDVM.Current; @@ -92,7 +92,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass> { return false; } //-- - if (UI_.Question( + if (UI.Question( testForReplaceNames.size() + " тестов будет заменено,\n" + newTestsNames.size() + " тестов будет добавлено.\n" + "Продолжить" diff --git a/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java b/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java index 7de6d352..2067b826 100644 --- a/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java +++ b/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java @@ -1,5 +1,5 @@ package _VisualDVM.Passes.All; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Sapfor.SapforTransformation; @@ -65,7 +65,7 @@ public class SPF_CreateParallelVariant extends SapforTransformation { protected void performDone() throws Exception { Global.transformationPermission = TransformationPermission.VariantsOnly; target.migrateFilesSettings(target.last_version, true, true); - if (UI_.isActive()) + if (UI.isActive()) variant.UpdateStats(sapfor.getPredictorStats(), target.last_version.name); } @Override diff --git a/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java b/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java index 52afc842..5c0c2099 100644 --- a/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java +++ b/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java @@ -1,5 +1,5 @@ package _VisualDVM.Passes.All; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.Passes.PassCode; @@ -29,7 +29,7 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys @Override protected boolean canStart(Object... args) throws Exception { if (Global.mainModule.getDb().settings.get(SettingName.MPI_PROGRAM).toBoolean()) { - UI_.Info("Включена настройка SAPFOR 'MPI программа'." + + UI.Info("Включена настройка SAPFOR 'MPI программа'." + "\nПостроение распределения данных невозможно."); Global.mainModule.getPass(PassCode.SPF_SharedMemoryParallelization).Do(); return false; diff --git a/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java b/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java index bcea6eed..43044d21 100644 --- a/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java +++ b/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.PassState; import Common.Visual.Controls.PassControl; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Sapfor.SilentSapforPass; @@ -20,7 +20,7 @@ public class SPF_GetGCovInfo extends SilentSapforPass { } @Override protected boolean canStart(Object... args) throws Exception { - if (UI_.Question("Все анализы будут сброшены.Продолжить")) { + if (UI.Question("Все анализы будут сброшены.Продолжить")) { SPF_ParseFilesWithOrder.silent = true; return super.canStart(args) && Global.mainModule.getPass(PassCode.GCOV).Do() && Global.mainModule.getPass(PassCode.SPF_ParseFilesWithOrder).Do(); } diff --git a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java index 42f1674b..0d288982 100644 --- a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java +++ b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java @@ -1,6 +1,6 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.Passes.PassCode; @@ -109,7 +109,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis { protected void performPreparation() throws Exception { super.performPreparation(); //удаление интеррупта. //------------------------------------------------------------------------------------------>>> пакетный режим. - if (!precompilation_done && UI_.isActive()) { + if (!precompilation_done && UI.isActive()) { Global.mainModule.getPass(PassCode.Save).Do(); target.CleanAnalyses(); } diff --git a/src/_VisualDVM/Passes/All/SaveGraph.java b/src/_VisualDVM/Passes/All/SaveGraph.java index eb59bde9..15fc475e 100644 --- a/src/_VisualDVM/Passes/All/SaveGraph.java +++ b/src/_VisualDVM/Passes/All/SaveGraph.java @@ -2,7 +2,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Passes.PassException; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm; import com.mxgraph.io.mxCodec; @@ -62,6 +62,6 @@ public class SaveGraph extends Pass { } @Override protected void showDone() throws Exception { - UI_.Info("Граф успешно сохранен в файл: " + Utils_.Brackets(target.getAbsolutePath())); + UI.Info("Граф успешно сохранен в файл: " + Utils_.Brackets(target.getAbsolutePath())); } } diff --git a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java index 4c78b617..fd864f01 100644 --- a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java +++ b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java @@ -1,5 +1,5 @@ package _VisualDVM.Passes.All; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.CompilerType; @@ -62,6 +62,6 @@ public class StartSelectedDVMConfigurations extends PublishServerObject DBTable table = getDb().tables.get(d); if (table.getCheckedCount() > 0) { target = table.getCheckedKeys(); - return UI_.Warning(table.getCheckedCount() + " объектов будет удален(о)."); + return UI.Warning(table.getCheckedCount() + " объектов будет удален(о)."); } else { if (Global.mainModule.Check(Log, table.CurrentName())) { target = new Vector<>(); diff --git a/src/_VisualDVM/Passes/Testing/StartTestingPackage.java b/src/_VisualDVM/Passes/Testing/StartTestingPackage.java index c8732a4f..ab27120f 100644 --- a/src/_VisualDVM/Passes/Testing/StartTestingPackage.java +++ b/src/_VisualDVM/Passes/Testing/StartTestingPackage.java @@ -1,5 +1,5 @@ package _VisualDVM.Passes.Testing; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.Server.PublishServerObject; @@ -35,7 +35,7 @@ public abstract class StartTestingPackage

extends Publ Log.Writeln_("В пакете отсутствуют задачи."); return false; } - if (UI_.Question("Будет запущено:\n" + if (UI.Question("Будет запущено:\n" + target.tasksCount + " задач.\n" + "Продолжить")) { target.state = TasksPackageState.Queued; diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java index 73bcc5ee..41c16279 100644 --- a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java +++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java @@ -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; diff --git a/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java b/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java index 9f943eed..5ba773f1 100644 --- a/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java +++ b/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java @@ -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() { diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java b/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java index e1410e69..5347d492 100644 --- a/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java +++ b/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java @@ -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() { diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java index 8999ee51..1a95a25c 100644 --- a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java +++ b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java @@ -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 extends iDBTable { 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 { diff --git a/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java b/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java index 00482b4a..d8d496bc 100644 --- a/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java +++ b/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java @@ -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 { 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); } }; } diff --git a/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java b/src/_VisualDVM/ProjectData/Project/UI/RendererProjectVersion.java similarity index 97% rename from src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java rename to src/_VisualDVM/ProjectData/Project/UI/RendererProjectVersion.java index 0dad2505..ecec0234 100644 --- a/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java +++ b/src/_VisualDVM/ProjectData/Project/UI/RendererProjectVersion.java @@ -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, diff --git a/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java b/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java index eaeefb34..8d9acf98 100644 --- a/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java +++ b/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java @@ -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() { diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java index 47ce708d..70313869 100644 --- a/src/_VisualDVM/ProjectData/Project/db_project_info.java +++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java @@ -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; } } diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java index 9e7c6e02..3d1b2474 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java @@ -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 { public ArraysSet() { super(Long.class, ProjectArray.class); @@ -38,10 +38,10 @@ public class ArraysSet extends DataSet { 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); } } diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java index 6e673659..c570da3c 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java @@ -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 { +public class DimensionStateChanger extends EditorDBObject { @Override public Object getCellEditorValue() { return value; diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java index 2499c138..64177206 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java @@ -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 { public DimensionsTableForm() { super(StyledTable.class); @@ -26,7 +23,7 @@ public class DimensionsTableForm extends ControlForm { @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 { }) { @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)); } }; } diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RendererTreeRule.java similarity index 93% rename from src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java rename to src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RendererTreeRule.java index d11d828b..583f1af1 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RendererTreeRule.java @@ -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, diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java index 91216a23..951424ef 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java @@ -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) { diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java index fc812d13..bd50dd07 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java @@ -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())); } } } diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java index 73f662f8..e38f29ce 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java @@ -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())); } } } diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java index c728ade6..aaddf241 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java @@ -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 { @Override public void Clear() { super.Clear(); - UI_.Clear(content); + UI.Clear(content); } } diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java index 6e57b793..dd3bc8b6 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java @@ -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; diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java index 659c672b..a7fb12e5 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java @@ -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() { diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java index 5b8b425e..73385b5b 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java @@ -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() { diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java index 4ad512c2..16327d0e 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java +++ b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java @@ -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() { diff --git a/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java b/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java index 8222739d..66ddefbb 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java +++ b/src/_VisualDVM/ProjectData/SapforData/Loops/LoopState.java @@ -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; } diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java index ce87645b..4f95c37a 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java +++ b/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java @@ -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 { //суррогат. нужен только для сохры столбцов. во всяком случае пока. public RegionsSet() { @@ -31,8 +30,8 @@ public class RegionsSet extends DataSet { 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); } }; } diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/RendererVariantRank.java b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/RendererVariantRank.java new file mode 100644 index 00000000..3077132a --- /dev/null +++ b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/RendererVariantRank.java @@ -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; + } +} diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java deleted file mode 100644 index 74cf4162..00000000 --- a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java +++ /dev/null @@ -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; - } -} diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java b/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java index c0e71ab3..b6d32ee0 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java +++ b/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java @@ -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 { public VariantsSet() { super(String.class, ParallelVariant.class); @@ -23,11 +26,11 @@ public class VariantsSet extends DataSet { @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); } }; } diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java index 027a6f5f..e317c002 100644 --- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java +++ b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java @@ -1,6 +1,9 @@ package _VisualDVM.Repository.BugReport; import Common.Database.Tables.DBTable; import Common.Visual.DataSetControlForm; +import Common.Visual.Tables.RendererDate; +import Common.Visual.Tables.RendererProgressBar; +import Common.Visual.Tables.RendererStatusEnum; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -11,8 +14,6 @@ import java.awt.event.KeyEvent; import java.util.Comparator; import java.util.Vector; import java.util.stream.Collectors; - -import static Common.Visual.Tables.TableRenderers.*; public class BugReportsDBTable extends DBTable { public BugReportsDBTable() { super(String.class, BugReport.class); @@ -41,10 +42,10 @@ public class BugReportsDBTable extends DBTable { @Override protected void AdditionalInitColumns() { columns.get(1).setMaxWidth(600); - columns.get(5).setRenderer(RendererProgress); - columns.get(6).setRenderer(RendererDate); - columns.get(7).setRenderer(RendererDate); - columns.get(8).setRenderer(RendererStatusEnum); + columns.get(5).setRendererClass(RendererProgressBar.class); + columns.get(6).setRendererClass(RendererDate.class); + columns.get(7).setRendererClass(RendererDate.class); + columns.get(8).setRendererClass(RendererStatusEnum.class); } @Override public void MouseAction2() throws Exception { diff --git a/src/_VisualDVM/Repository/Component/ComponentsSet.java b/src/_VisualDVM/Repository/Component/ComponentsSet.java index e8b4cb91..0e05d725 100644 --- a/src/_VisualDVM/Repository/Component/ComponentsSet.java +++ b/src/_VisualDVM/Repository/Component/ComponentsSet.java @@ -1,13 +1,13 @@ package _VisualDVM.Repository.Component; import Common.Database.Tables.DataSet; import Common.Visual.DataSetControlForm; +import Common.Visual.Tables.RendererMaskedNanInteger; +import Common.Visual.Tables.RendererStatusEnum; import _VisualDVM.Current; import _VisualDVM.Visual.Menus.ComponentsMenuBar; import java.util.Vector; -import static Common.Visual.Tables.TableRenderers.RendererMaskedInt; -import static Common.Visual.Tables.TableRenderers.RendererStatusEnum; public class ComponentsSet extends DataSet { public ComponentsSet() { super(ComponentType.class, Component.class); @@ -30,9 +30,9 @@ public class ComponentsSet extends DataSet { @Override protected void AdditionalInitColumns() { columns.get(0).setVisible(false); - columns.get(3).setRenderer(RendererMaskedInt); - columns.get(4).setRenderer(RendererMaskedInt); - columns.get(6).setRenderer(RendererStatusEnum); + columns.get(3).setRendererClass(RendererMaskedNanInteger.class); + columns.get(4).setRendererClass(RendererMaskedNanInteger.class); + columns.get(6).setRendererClass(RendererStatusEnum.class); } }; } diff --git a/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java b/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java index b40b03ef..891cd118 100644 --- a/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java +++ b/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java @@ -1,6 +1,6 @@ package _VisualDVM.Repository.Component.PerformanceAnalyzer; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Component.ComponentType; @@ -142,7 +142,7 @@ public class PerformanceAnalyzer extends Component { } public void Start() { if (isActive) { - UI_.Info("Анализатор уже запущен"); + UI.Info("Анализатор уже запущен"); } else { main_thread = new Thread(this::ServerBody); main_thread.start(); diff --git a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java index d94e88c0..5d765432 100644 --- a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java +++ b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java @@ -2,7 +2,7 @@ package _VisualDVM.Repository.Component.Sapfor; import Common.CommonConstants; import Common.Passes.PassException; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; @@ -342,7 +342,7 @@ public abstract class Sapfor extends OSDComponent { Visualizer_2.UnpackVersionInfo(this, getResult()); } catch (Exception e) { Utils_.MainLog.PrintException(e); - UI_.Error("Не удалось получить версию компонента " + Utils_.DQuotes(getComponentType().getDescription())); + UI.Error("Не удалось получить версию компонента " + Utils_.DQuotes(getComponentType().getDescription())); } } public abstract String getUpdateCommand(); @@ -537,7 +537,7 @@ public abstract class Sapfor extends OSDComponent { Utils.WriteToFile(file, OldFiles.get(name)); } OldFiles.clear(); - } else UI_.Info("Сохранение файлов отсутствует."); + } else UI.Info("Сохранение файлов отсутствует."); } if (cuf != null) Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(cuf); @@ -554,13 +554,13 @@ public abstract class Sapfor extends OSDComponent { for (PassCode code : getAnalysesCodes()) (Global.mainModule.getPass(code)).Reset(); //------------------------------------------------------------------------------------------>>>> пакетный режим. - if (UI_.isActive()) { + if (UI.isActive()) { Global.mainModule.getPass(PassCode.Precompilation).Reset(); Global.mainModule.getPass(PassCode.SPF_GetGCovInfo).Reset(); } Global.enable_text_changed = false; Global.transformationPermission = TransformationPermission.None; - if ((UI_.isActive()) && (Global.mainModule.getUI().hasMainWindow()) && (Global.mainModule.getUI().getVersionsWindow() != null)) + if ((UI.isActive()) && (Global.mainModule.getUI().hasMainWindow()) && (Global.mainModule.getUI().getVersionsWindow() != null)) Global.mainModule.getUI().getVersionsWindow().BlockVariants(); } //--------------------------------------------------------------------------->> diff --git a/src/_VisualDVM/Repository/Component/Visualizer_2.java b/src/_VisualDVM/Repository/Component/Visualizer_2.java index 574067aa..992dc9f4 100644 --- a/src/_VisualDVM/Repository/Component/Visualizer_2.java +++ b/src/_VisualDVM/Repository/Component/Visualizer_2.java @@ -1,7 +1,7 @@ package _VisualDVM.Repository.Component; import Common.Passes.PassException; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Utils; @@ -66,7 +66,7 @@ public class Visualizer_2 extends OSDComponent { super.Update(); SendRequest("update_server: "); ReplaceOldFile(); - UI_.Info("Сервер успешно обновлен.\n" + + UI.Info("Сервер успешно обновлен.\n" + "Визуализатор завершает работу.\n" + "Для продолжения перезапустите визуализатор вручную."); System.exit(0); diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java b/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java index 17edcbcb..154f44ec 100644 --- a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java +++ b/src/_VisualDVM/Repository/Subscribes/UI/SubscriberForm.java @@ -1,6 +1,6 @@ package _VisualDVM.Repository.Subscribes.UI; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.AccountRole; @@ -33,7 +33,7 @@ public class SubscriberForm extends DBObjectDialog fields.tfName.setText(Result.name); fields.tfAddress.setText(Result.address); fields.cbMail.setSelected(Result.mailOn != 0); - UI_.TrySelect(fields.cbRole, Result.role); + UI.TrySelect(fields.cbRole, Result.role); } @Override public void SetEditLimits() { diff --git a/src/_VisualDVM/TestingSystem/Common/Group/Group.java b/src/_VisualDVM/TestingSystem/Common/Group/Group.java index a93af12c..343ccb51 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/Group.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/Group.java @@ -2,7 +2,7 @@ package _VisualDVM.TestingSystem.Common.Group; import Common.Database.Objects.DBObject; import Common.Database.Objects.riDBObject; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.ProjectFile; import _VisualDVM.ProjectData.LanguageName; @@ -88,7 +88,7 @@ public class Group extends riDBObject { @Override public void select(boolean flag) { super.select(flag); - if (UI_.isActive()) + if (UI.isActive()) Global.mainModule.getUI().getMainWindow().ShowCheckedTestsCount(); } public String GenerateMakefile(Test test, String dvm_drv, String flags_in) { diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java index 7baf46ba..29e149d8 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java @@ -7,7 +7,7 @@ import Common.Database.Tables.iDBTable; import Common.Visual.DBObjectFilter; import Common.Visual.DataSetControlForm; import Common.Visual.DataSetFilter; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Current; import _VisualDVM.ProjectData.LanguageName; @@ -119,8 +119,8 @@ public class GroupsDBTable extends iDBTable { @Override public void fillFields() { fields.tfName.setText(Result.description); - UI_.TrySelect(fields.cbType, Result.type); - UI_.TrySelect(fields.cbLanguage, Result.language); + UI.TrySelect(fields.cbType, Result.type); + UI.TrySelect(fields.cbLanguage, Result.language); } @Override public void ProcessResult() { diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Test.java b/src/_VisualDVM/TestingSystem/Common/Test/Test.java index 3b8d3f10..91196fa3 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/Test.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/Test.java @@ -3,7 +3,7 @@ import Common.CommonConstants; import Common.Database.Objects.DBObject; import Common.Database.Objects.riDBObject; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.All.UnzipFolderPass; @@ -53,7 +53,7 @@ public class Test extends riDBObject { @Override public void select(boolean flag) { super.select(flag); - if (UI_.isActive()) + if (UI.isActive()) Global.mainModule.getUI().getMainWindow().ShowCheckedTestsCount(); } //--- diff --git a/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java b/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java index ab7f1d2b..17aefc8c 100644 --- a/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java +++ b/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java @@ -4,7 +4,7 @@ import Common.Utils.Utils_; import Common.Visual.Controls.MenuBarButton; import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Menus.VisualiserMenuBar; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -76,7 +76,7 @@ public class TestingMenuBar extends VisualiserMenuBar { sCheckTime.setMaximumSize(new Dimension(60, 26)); sCheckTime.setModel(new SpinnerNumberModel(Global.properties.CheckTestingIntervalSeconds, 10, 3600, 1)); sCheckTime.setValue(Global.properties.CheckTestingIntervalSeconds); - UI_.MakeSpinnerRapid(sCheckTime, e -> { + UI.MakeSpinnerRapid(sCheckTime, e -> { Global.properties.updateField("CheckTestingIntervalSeconds", sCheckTime.getValue()); if (Global.properties.AutoCheckTesting) TestingServer.ResetTimer(); }); diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java index 21345d99..69deea39 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java @@ -2,7 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration; import Common.Database.Objects.DBObject; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; -import Common.Visual.Tables.TableRenderers; +import Common.Visual.Tables.RendererMultiline; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Current; import _VisualDVM.Global; @@ -34,7 +34,7 @@ public class DVMConfigurationDBTable extends iDBTable { } @Override protected void AdditionalInitColumns() { - columns.get(6).setRenderer(TableRenderers.RendererMultiline); + columns.get(6).setRendererClass(RendererMultiline.class); columns.get(6).setMaxWidth(500); } }; diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java index 44eb58e6..8a6f5cde 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java @@ -1,6 +1,10 @@ package _VisualDVM.TestingSystem.DVM.DVMPackage; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; +import Common.Visual.Tables.RendererDate; +import Common.Visual.Tables.RendererMultiline; +import Common.Visual.Tables.RendererProgressBar; +import Common.Visual.Tables.RendererStatusEnum; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -10,7 +14,6 @@ import _VisualDVM.ServerObjectsCache.VisualCaches; import java.util.Comparator; import java.util.Date; -import static Common.Visual.Tables.TableRenderers.*; public class DVMPackageDBTable extends iDBTable { public static boolean filterMyOnly = false; public static boolean filterActive = false; @@ -38,12 +41,11 @@ public class DVMPackageDBTable extends iDBTable { } @Override protected void AdditionalInitColumns() { - columns.get(6).setRenderer(RendererMultiline); - // columns.get(7).setRenderer(RendererMultiline); - columns.get(9).setRenderer(RendererProgress); - columns.get(10).setRenderer(RendererDate); - columns.get(11).setRenderer(RendererDate); - columns.get(12).setRenderer(RendererStatusEnum); + columns.get(6).setRendererClass(RendererMultiline.class); + columns.get(9).setRendererClass(RendererProgressBar.class); + columns.get(10).setRendererClass(RendererDate.class); + columns.get(11).setRendererClass(RendererDate.class); + columns.get(12).setRendererClass(RendererStatusEnum.class); } @Override public void ShowCurrentObject() throws Exception { diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java index 665092b2..49ed5dd9 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java @@ -3,14 +3,14 @@ import Common.Database.Tables.DataSet; import Common.Visual.DBObjectFilter; import Common.Visual.DataSetControlForm; import Common.Visual.DataSetFilter; +import Common.Visual.Tables.RendererProgressBar; +import Common.Visual.Tables.RendererStatusEnum; import _VisualDVM.Current; import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; import java.util.Comparator; -import static Common.Visual.Tables.TableRenderers.RendererProgress; -import static Common.Visual.Tables.TableRenderers.RendererStatusEnum; public class DVMRunTasksSet extends DataSet { //todo обобщить бы наличие фильтров для всех таблиц. DVMPackage target; @@ -67,9 +67,9 @@ public class DVMRunTasksSet extends DataSet { } @Override protected void AdditionalInitColumns() { - columns.get(5).setRenderer(RendererStatusEnum); - columns.get(6).setRenderer(RendererStatusEnum); - columns.get(13).setRenderer(RendererProgress); + columns.get(5).setRendererClass(RendererStatusEnum.class); + columns.get(6).setRendererClass(RendererStatusEnum.class); + columns.get(13).setRendererClass(RendererProgressBar.class); } }; } diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java index 3b1e0bec..20ef75b3 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java @@ -2,13 +2,14 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration; import Common.Database.Tables.iDBTable; import Common.Utils.Vector_; import Common.Visual.DataSetControlForm; -import Common.Visual.Tables.TableEditors; -import Common.Visual.Tables.TableRenderers; +import Common.Visual.Tables.RendererMultiline; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Current; import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields; +import _VisualDVM.Visual.Tables.RendererConfigurationAuto; +import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto; import java.util.Vector; public class SapforConfigurationDBTable extends iDBTable { @@ -36,12 +37,12 @@ public class SapforConfigurationDBTable extends iDBTable { } @Override protected void AdditionalInitColumns() { - columns.get(4).setRenderer(TableRenderers.RendererAutoConfiguration); - columns.get(4).setEditor(TableEditors.EditorAutoConfiguration); + columns.get(4).setRendererClass(RendererConfigurationAuto.class); + columns.get(4).setEditorClass(SwitcherConfigurationAuto.class); columns.get(4).setMinWidth(25); columns.get(4).setMaxWidth(25); columns.get(6).setMaxWidth(500); - columns.get(7).setRenderer(TableRenderers.RendererMultiline); + columns.get(7).setRendererClass(RendererMultiline.class); columns.get(7).setMaxWidth(500); } }; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java index 04d3173b..2a858a87 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java @@ -1,6 +1,10 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforPackage; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; +import Common.Visual.Tables.RendererDate; +import Common.Visual.Tables.RendererMultiline; +import Common.Visual.Tables.RendererProgressBar; +import Common.Visual.Tables.RendererStatusEnum; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -10,8 +14,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar; import java.util.Comparator; import java.util.Date; - -import static Common.Visual.Tables.TableRenderers.*; public class SapforPackageDBTable extends iDBTable { public static boolean filterMyOnly = false; public static boolean filterActive = false; @@ -39,11 +41,11 @@ public class SapforPackageDBTable extends iDBTable { } @Override protected void AdditionalInitColumns() { - columns.get(4).setRenderer(RendererMultiline); - columns.get(7).setRenderer(RendererProgress); - columns.get(8).setRenderer(RendererDate); - columns.get(9).setRenderer(RendererDate); - columns.get(10).setRenderer(RendererStatusEnum); + columns.get(4).setRendererClass(RendererMultiline.class); + columns.get(7).setRendererClass(RendererProgressBar.class); + columns.get(8).setRendererClass(RendererDate.class); + columns.get(9).setRendererClass(RendererDate.class); + columns.get(10).setRendererClass(RendererStatusEnum.class); } @Override public void MouseAction2() throws Exception { diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java index b3ead076..50c73df5 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java @@ -1,7 +1,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Current; import _VisualDVM.Global; @@ -63,7 +63,7 @@ public class SapforSettingsCommandsDBTable extends iDBTable { @Override protected void AdditionalInitColumns() { // columns.get(0).setVisible(false); - columns.get(3).setRenderer(TableRenderers.RendererDate); - columns.get(4).setRenderer(TableRenderers.RendererStatusEnum); + columns.get(3).setRendererClass(RendererDate.class); + columns.get(4).setRendererClass(RendererStatusEnum.class); } @Override public void ShowCurrentObject() throws Exception { diff --git a/src/_VisualDVM/Utils.java b/src/_VisualDVM/Utils.java index 3b2ad3ba..98a3fd04 100644 --- a/src/_VisualDVM/Utils.java +++ b/src/_VisualDVM/Utils.java @@ -4,7 +4,7 @@ import Common.Utils.Index; import Common.Utils.StringTemplate; import Common.Utils.TextLog; import Common.Utils.Utils_; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.VFileChooser_; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.GlobalData.Tasks.TaskState; @@ -468,7 +468,7 @@ public class Utils { } } if (sources.isEmpty()) { - if (question) return UI_.Question("Папка " + Utils_.Brackets(folder.getName()) + "\n" + + if (question) return UI.Question("Папка " + Utils_.Brackets(folder.getName()) + "\n" + "не содержит ни одного файла, распознанного как поддерживаемый код\n" + "Всё равно открыть её как проект"); else return false; diff --git a/src/_VisualDVM/Visual/Editor/BaseEditor.java b/src/_VisualDVM/Visual/Editor/BaseEditor.java index acfe07e6..68116ce1 100644 --- a/src/_VisualDVM/Visual/Editor/BaseEditor.java +++ b/src/_VisualDVM/Visual/Editor/BaseEditor.java @@ -4,7 +4,7 @@ import Common.Utils.Utils_; import Common.Visual.Menus.StyledPopupMenu; import Common.Visual.Menus.TextEditorMenu; import Common.Visual.Themes.ThemeElement; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Dialog.DialogFields; import _VisualDVM.Visual.Syntax.SPFEditorTheme; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; @@ -46,7 +46,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF //todo переход в нужную строку по ctrl+g? case KeyEvent.VK_Z: if (getText().equals(startText)) { - UI_.Info("Начальная версия текста достигнута."); + UI.Info("Начальная версия текста достигнута."); e.consume(); } break; diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java index c3db86b2..4a3500ce 100644 --- a/src/_VisualDVM/Visual/MainUI.java +++ b/src/_VisualDVM/Visual/MainUI.java @@ -1,26 +1,9 @@ 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; @@ -28,10 +11,6 @@ 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; public SearchReplaceForm searchReplaceWindow = null; @@ -48,26 +27,9 @@ public class MainUI extends UIModule_ { //- 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) diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java index a08ffa72..8217c5aa 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java @@ -2,7 +2,7 @@ package _VisualDVM.Visual.Menus.MainMenuBar; import Common.Passes.Pass; import Common.Visual.Controls.MenuBarButton; import Common.Visual.Menus.VisualiserMenuBar; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer; @@ -29,7 +29,7 @@ public class MainMenuBar extends VisualiserMenuBar { setIcon("/icons/ComponentsActual.png"); addActionListener(e -> { if (PerformanceAnalyzer.isActive) { - UI_.Info("Перед работой с компонентами закройте анализатор производительности!"); + UI.Info("Перед работой с компонентами закройте анализатор производительности!"); } else { Global.mainModule.getPass(PassCode.GetComponentsActualVersions).Do(); Global.RefreshUpdatesStatus(); diff --git a/src/Common/Visual/Tables/VectorEditor.java b/src/_VisualDVM/Visual/Tables/EditorFilesHyperlinks.java similarity index 96% rename from src/Common/Visual/Tables/VectorEditor.java rename to src/_VisualDVM/Visual/Tables/EditorFilesHyperlinks.java index 0ebff5af..cdd7e306 100644 --- a/src/Common/Visual/Tables/VectorEditor.java +++ b/src/_VisualDVM/Visual/Tables/EditorFilesHyperlinks.java @@ -1,4 +1,4 @@ -package Common.Visual.Tables; +package _VisualDVM.Visual.Tables; import _VisualDVM.ProjectData.Files.UI.FilesHyperlinksPanel; import javax.swing.*; @@ -9,7 +9,7 @@ import java.awt.*; import java.util.EventObject; import java.util.Objects; import java.util.Vector; -public class VectorEditor extends FilesHyperlinksPanel implements TableCellEditor { +public class EditorFilesHyperlinks extends FilesHyperlinksPanel implements TableCellEditor { protected transient ChangeEvent changeEvent; @Override public Component getTableCellEditorComponent( diff --git a/src/Common/Visual/Tables/ConfigurationAutoRenderer.java b/src/_VisualDVM/Visual/Tables/RendererConfigurationAuto.java similarity index 60% rename from src/Common/Visual/Tables/ConfigurationAutoRenderer.java rename to src/_VisualDVM/Visual/Tables/RendererConfigurationAuto.java index 8a972bf4..ad1b733c 100644 --- a/src/Common/Visual/Tables/ConfigurationAutoRenderer.java +++ b/src/_VisualDVM/Visual/Tables/RendererConfigurationAuto.java @@ -1,6 +1,7 @@ -package Common.Visual.Tables; +package _VisualDVM.Visual.Tables; +import Common.Visual.Tables.RendererDBObject; import _VisualDVM.TestingSystem.Common.Configuration.Configuration; -public class ConfigurationAutoRenderer extends DBObjectRenderer { +public class RendererConfigurationAuto extends RendererDBObject { @Override public void Display() { if (value != null) { diff --git a/src/Common/Visual/Tables/HyperlinksRenderer.java b/src/_VisualDVM/Visual/Tables/RendererHyperlinks.java similarity index 83% rename from src/Common/Visual/Tables/HyperlinksRenderer.java rename to src/_VisualDVM/Visual/Tables/RendererHyperlinks.java index ce9360b9..1ffccec5 100644 --- a/src/Common/Visual/Tables/HyperlinksRenderer.java +++ b/src/_VisualDVM/Visual/Tables/RendererHyperlinks.java @@ -1,11 +1,11 @@ -package Common.Visual.Tables; +package _VisualDVM.Visual.Tables; import Common.Visual.Controls.HyperlinksStyledList; import javax.swing.*; import javax.swing.table.TableCellRenderer; import java.awt.*; import java.util.Vector; -public class HyperlinksRenderer extends HyperlinksStyledList implements TableCellRenderer { +public class RendererHyperlinks extends HyperlinksStyledList implements TableCellRenderer { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { setBackground(isSelected ? table.getSelectionBackground() : table.getBackground()); diff --git a/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java b/src/_VisualDVM/Visual/Tables/SwitcherConfigurationAuto.java similarity index 90% rename from src/Common/Visual/Tables/ConfigurationAutoSwitcher.java rename to src/_VisualDVM/Visual/Tables/SwitcherConfigurationAuto.java index 0e1ca384..a5e83e31 100644 --- a/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java +++ b/src/_VisualDVM/Visual/Tables/SwitcherConfigurationAuto.java @@ -1,12 +1,13 @@ -package Common.Visual.Tables; +package _VisualDVM.Visual.Tables; import Common.Passes.Pass; +import Common.Visual.Tables.EditorDBObject; import _VisualDVM.Global; import _VisualDVM.Passes.Server.EditServerObject; import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.TestingSystem.Common.Configuration.Configuration; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; -public class ConfigurationAutoSwitcher extends DBObjectEditor { +public class SwitcherConfigurationAuto extends EditorDBObject { @Override public void Action() { value.SwitchAuto(); diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java index 72369be1..0038cd26 100644 --- a/src/_VisualDVM/Visual/Windows/CallbackForm.java +++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java @@ -2,7 +2,7 @@ package _VisualDVM.Visual.Windows; import Common.Utils.Utils_; import Common.Visual.Menus.VisualiserMenuBar; import Common.Visual.TextField.StyledTextField; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.Passes.PassCode; @@ -283,7 +283,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { } @Override public void SwitchScreen(boolean small) { - UI_.Clear(descriptionPanel); + UI.Clear(descriptionPanel); //------------------------------------------------------------------ descriptionInterface = small ? descriptionTabs : descriptionFields; descriptionInterface.setEditorScroll(bugDescriptionScroll); @@ -293,7 +293,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { descriptionPanel.revalidate(); descriptionPanel.repaint(); //--------- - UI_.Clear(commentPanel); + UI.Clear(commentPanel); //------------------------------------------------------------------ commentInterface = small ? commentTabs : commentFields; commentInterface.setEditorScroll(bugCommentScroll); @@ -363,7 +363,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { settingsTools = new VisualiserMenuBar(); } public void EnableBugreports() { - UI_.Clear(accountPanel); + UI.Clear(accountPanel); accountPanel.add(SC10); Global.mainModule.getUI().getMainWindow().SwitchTestingTabs(true); } diff --git a/src/_VisualDVM/Visual/Windows/ComparisonForm.java b/src/_VisualDVM/Visual/Windows/ComparisonForm.java index 4660a81a..e06c9e59 100644 --- a/src/_VisualDVM/Visual/Windows/ComparisonForm.java +++ b/src/_VisualDVM/Visual/Windows/ComparisonForm.java @@ -6,9 +6,10 @@ import Common.Utils.TextLog; import Common.Utils.Utils_; import Common.Visual.Controls.ShortLabel; import Common.Visual.Menus.VisualiserMenuBar; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; +import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor; import _VisualDVM.Utils; import _VisualDVM.Visual.Editor.BaseEditor; import javafx.util.Pair; @@ -149,7 +150,7 @@ public abstract class ComparisonForm { applyObject(); showObject(); } else - UI_.Info(log.toString()); + UI.Info(log.toString()); } public void ApplyObject(DBObject object_in) { RemoveObject(); @@ -232,8 +233,8 @@ public abstract class ComparisonForm { slave.Body.getLineStartOffset(colors.get(diff_num).getKey()), slave.Body.getLineEndOffset(colors.get(diff_num).getKey()), colors.get(diff_num).getValue() ? - UI_.GreenTextPainter : - UI_.RedTextPainter + SPFEditor.GreenTextPainter : + SPFEditor.RedTextPainter ); } if (colors.size() > 0) current_diff_line = 0; diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java index 37e9d875..86a0ef37 100644 --- a/src/_VisualDVM/Visual/Windows/FileForm.java +++ b/src/_VisualDVM/Visual/Windows/FileForm.java @@ -1,7 +1,7 @@ package _VisualDVM.Visual.Windows; import Common.CommonConstants; import Common.Visual.Trees.TreeForm; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.Passes.PassCode; @@ -192,7 +192,7 @@ 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(); @@ -213,7 +213,7 @@ public class FileForm implements FileWindow, FormWithSplitters { } @Override public void ShowText() { - UI_.Clear(editorPanel); + UI.Clear(editorPanel); editorPanel.add(new RTextScrollPane(Body = new SPFEditor(file))); Global.mainModule.getUI().getSearchReplaceWindow().updateEditor(Body); } @@ -365,12 +365,12 @@ public class FileForm implements FileWindow, FormWithSplitters { @Override public void CollapseGraphs() { Global.mainModule.getDb().splitters.get("SC12").position = SC12.getDividerLocation(); - UI_.Clear(editorBackground); + UI.Clear(editorBackground); editorBackground.add(editorPanel); } @Override public void ExpandGraphs() { - UI_.Clear(editorBackground); + UI.Clear(editorBackground); SC12.setRightComponent(editorPanel); editorBackground.add(SC12); //-- @@ -380,12 +380,12 @@ public class FileForm implements FileWindow, FormWithSplitters { @Override public void CollapseMessages() { Global.mainModule.getDb().splitters.get("SC1").position = SC1.getDividerLocation(); - UI_.Clear(content); + UI.Clear(content); content.add(editorBackground); } @Override public void ExpandMessages() { - UI_.Clear(content); + UI.Clear(content); SC1.setLeftComponent(editorBackground); content.add(SC1); SC1.setDividerLocation(Global.mainModule.getDb().splitters.get("SC1").position); diff --git a/src/_VisualDVM/Visual/Windows/FunctionsForm.java b/src/_VisualDVM/Visual/Windows/FunctionsForm.java index a0af873a..684b1af4 100644 --- a/src/_VisualDVM/Visual/Windows/FunctionsForm.java +++ b/src/_VisualDVM/Visual/Windows/FunctionsForm.java @@ -1,6 +1,6 @@ package _VisualDVM.Visual.Windows; import Common.Visual.TextField.StyledTextField; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions; import _VisualDVM.Passes.PassCode; @@ -72,19 +72,19 @@ public class FunctionsForm implements FunctionsWindow { sDepth.setModel(new SpinnerNumberModel(1, 0, 64, 1 )); - UI_.MakeSpinnerRapid(sIterations, e -> { + UI.MakeSpinnerRapid(sIterations, e -> { Global.mainModule.getProject().UpdatefgIterations((int) sIterations.getValue()); FunctionsGraphUI.ffTimer.restart(); }); - UI_.MakeSpinnerRapid(sResistance, e -> { + UI.MakeSpinnerRapid(sResistance, e -> { Global.mainModule.getProject().UpdatefgResistance((int) sResistance.getValue()); FunctionsGraphUI.ffTimer.restart(); }); - UI_.MakeSpinnerRapid(sScreen, e -> { + UI.MakeSpinnerRapid(sScreen, e -> { Global.mainModule.getProject().UpdatefgScreen((double) sScreen.getValue()); FunctionsGraphUI.ffTimer.restart(); }); - UI_.MakeSpinnerRapid(sDepth, e -> { + UI.MakeSpinnerRapid(sDepth, e -> { SPF_GetGraphFunctionPositions.depth = (int) sDepth.getValue(); FunctionsGraphUI.ffTimer.restart(); }); diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java index 26e961d1..a8e11cf2 100644 --- a/src/_VisualDVM/Visual/Windows/ProjectForm.java +++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java @@ -3,7 +3,7 @@ import Common.MainModule_; import Common.Utils.Utils_; import Common.Visual.Controls.TabToolBar; import Common.Visual.Trees.TreeForm; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.Passes.PassCode; @@ -170,7 +170,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { projectTabs.setSelectedIndex(0); } }); - UI_.Clear(fileBackground); + UI.Clear(fileBackground); //filesTabs.removeAll(); } @Override @@ -222,7 +222,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { } @Override public void RefreshTabsNames() { - UI_.ShowTabsNames(projectTabs, 1, Global.mainModule.getDb().settings.get(SettingName.ShowFullTabsNames).toBoolean()); + UI.ShowTabsNames(projectTabs, 1, Global.mainModule.getDb().settings.get(SettingName.ShowFullTabsNames).toBoolean()); } @Override public void RefreshProjectTreeAndMessages() { @@ -252,7 +252,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { } @Override public void ShowProjectView() { - UI_.Clear(projectViewPanel); + UI.Clear(projectViewPanel); ProjectView view = Global.mainModule.getProjectView(); menuBar.getProjectViewMenu().setToolTipText(view.getDescription()); menuBar.getProjectViewMenu().setIcon(Utils_.getIcon(view.getIcon())); @@ -294,7 +294,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { public void CollapseProjectTrees() { Global.mainModule.getDb().splitters.get("SC3").position = SC3.getDividerLocation(); //--- - UI_.Clear(projectBackground); + UI.Clear(projectBackground); projectBackground.add(fileBackground); } @Override diff --git a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java index 3ca43480..5b017961 100644 --- a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java +++ b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java @@ -4,7 +4,7 @@ import Common.Passes.Pass; import Common.Utils.TextLog; import Common.Visual.Controls.ShortLabel; import Common.Visual.Menus.VisualiserMenuBar; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -102,7 +102,7 @@ public class SapforPackagesComparisonForm { showObject(); } } else - UI_.Info(log.toString()); + UI.Info(log.toString()); } public void ApplyObject(DBObject object_in) { RemoveObject(); @@ -143,7 +143,7 @@ public class SapforPackagesComparisonForm { } //--- public void showNoTree() { - UI_.Clear(treePanel); + UI.Clear(treePanel); } public void showObject() { lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : "")); diff --git a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java index f6e808c4..f252bd51 100644 --- a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java +++ b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java @@ -2,7 +2,7 @@ package _VisualDVM.Visual.Windows; import Common.Utils.Utils_; import Common.Visual.TextField.StyledTextField; import Common.Visual.Trees.StyledTree; -import Common.Visual.UI_; +import Common.Visual.UI; import Common.Visual.Windows.Form; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; @@ -193,7 +193,7 @@ public class SearchReplaceForm extends Form { } public void showNoFilesMatches() { lFilesMatchesCount.setText("—"); - UI_.Clear(filesTreePanel); + UI.Clear(filesTreePanel); } public void showFilesMatches() { long total = 0; diff --git a/src/_VisualDVM/Visual/Windows/TestingForm.java b/src/_VisualDVM/Visual/Windows/TestingForm.java index b42ddf39..8cd438d7 100644 --- a/src/_VisualDVM/Visual/Windows/TestingForm.java +++ b/src/_VisualDVM/Visual/Windows/TestingForm.java @@ -1,7 +1,7 @@ package _VisualDVM.Visual.Windows; import Common.CommonConstants; import Common.Visual.TextField.StyledTextField; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.CompilerType; @@ -311,7 +311,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow { @Override public void CollapseCredentials() { Global.mainModule.getDb().splitters.get("SC71").position = SC71.getDividerLocation(); - UI_.Clear(credentialsPanel); + UI.Clear(credentialsPanel); credentialsPanel.add(Global.mainModule.getUI().getCredentialsMenuBar()); SC71.setDividerLocation(30); SC71.setDividerSize(0); @@ -320,7 +320,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow { } @Override public void ExpandCredentials() { - UI_.Clear(credentialsPanel); + UI.Clear(credentialsPanel); credentialsPanel.add(SC18); SC71.setDividerLocation(200); SC71.setDividerSize(3); diff --git a/src/_VisualDVM/Visual/Windows/VersionsForm.java b/src/_VisualDVM/Visual/Windows/VersionsForm.java index e665ed8f..67890a7e 100644 --- a/src/_VisualDVM/Visual/Windows/VersionsForm.java +++ b/src/_VisualDVM/Visual/Windows/VersionsForm.java @@ -1,6 +1,6 @@ package _VisualDVM.Visual.Windows; import Common.Visual.Trees.TreeForm; -import Common.Visual.UI_; +import Common.Visual.UI; import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.UI.VersionsTree; import _VisualDVM.ProjectData.Project.db_project_info; @@ -51,7 +51,7 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow { } @Override public void ShowNoProjectVariants() { - UI_.Clear(variantsFormPanel); + UI.Clear(variantsFormPanel); versionsTabs.setEnabledAt(0, false); } @Override