рефакторинг верхних меню таблиц.

.idea/workspace.xml

@@ -7,8 +7,69 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParametersMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/ModulesMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteProfile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/DBArraysMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubscribersMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestsMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ComponentsMenuBar.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/Common/Database/Tables/DataSet.java

@@ -41,8 +41,9 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     }
     protected void createFilters() {
     }
-    public Class getMenuBarClass() {
+    public boolean hasMenuBar(){return true;}
-        return null;
+    public DataMenuBar createMenuBar() {
+        return new DataMenuBar(getPluralDescription());
     }
     public void mountUI(JPanel content_in) {
         UI.Clear(content_in);
@@ -50,11 +51,13 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         ui_ = createUI();
         ui_.setContent(content_in);
         //-->
-        if (getMenuBarClass() != null) {
+        if (hasMenuBar()) {
             try {
                 DataMenuBar bar = null;
                 if (!MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
-                    bar = (DataMenuBar) getMenuBarClass().newInstance();
+                    bar = createMenuBar();
+                    if (ui_.hasCheckBox())
+                        bar.createSelectionButtons(this);
                     MainModule_.instance.getUI().menuBars.put(getClass(), bar);
                 } else {
                     bar = MainModule_.instance.getUI().menuBars.get(getClass());
@@ -62,8 +65,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
                 content_in.add(bar, BorderLayout.NORTH);
                 //--
                 setFilterUI(count -> MainModule_.instance.getUI().menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
-                if (ui_.hasCheckBox())
-                    bar.createSelectionButtons(this);
                 //--
             } catch (Exception ex) {
                 ex.printStackTrace();

src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java

@@ -6,6 +6,7 @@ import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Utils.Utils_;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
@@ -14,6 +15,7 @@ import _VisualDVM.GlobalData.Compiler.UI.CompilerFields;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Module.Module;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Utils;
 import _VisualDVM.Validators.PathValidator;
 
@@ -161,7 +163,11 @@ public class CompilersDBTable extends iDBTable<Compiler> {
         return Current.Compiler;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return CompilersMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),PassCode.AddCompiler,
+                PassCode.EditCompiler,
+                PassCode.DeleteCompiler,
+                PassCode.ShowCompilerVersion,
+                PassCode.ShowCompilerHelp);
     }
 }

src/_VisualDVM/GlobalData/Compiler/CompilersMenuBar.java

@@ -1,13 +0,0 @@
-package _VisualDVM.GlobalData.Compiler;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class CompilersMenuBar extends DataMenuBar {
-    public CompilersMenuBar() {
-        super("компиляторы",
-                PassCode.AddCompiler,
-                PassCode.EditCompiler,
-                PassCode.DeleteCompiler,
-                PassCode.ShowCompilerVersion,
-                PassCode.ShowCompilerHelp);
-    }
-}

src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java

@@ -2,11 +2,13 @@ package _VisualDVM.GlobalData.DVMParameter;
 import Common.Database.Tables.iDBTable;
 import Common.Utils.Utils_;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Utils;
 public class DVMParameterDBTable extends iDBTable<DVMParameter> {
     public DVMParameterDBTable() {
@@ -96,7 +98,10 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
         };
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return DVMParametersMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.AddDVMParameter,
+                PassCode.EditDVMParameter,
+                PassCode.DeleteDVMParameter);
     }
 }

src/_VisualDVM/GlobalData/DVMParameter/DVMParametersMenuBar.java

@@ -1,11 +0,0 @@
-package _VisualDVM.GlobalData.DVMParameter;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class DVMParametersMenuBar extends DataMenuBar {
-    public DVMParametersMenuBar() {
-        super("параметры",
-                PassCode.AddDVMParameter,
-                PassCode.EditDVMParameter,
-                PassCode.DeleteDVMParameter);
-    }
-}

src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java

@@ -2,11 +2,13 @@ package _VisualDVM.GlobalData.EnvironmentValue;
 import Common.Database.Tables.iDBTable;
 import Common.Utils.Utils_;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Utils;
 public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
     public EnvironmentValuesDBTable() {
@@ -96,7 +98,11 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
         return null;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return EnvironmentValuesMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.AddEnvironmentValue,
+                PassCode.EditEnvironmentValue,
+                PassCode.DeleteEnvironmentValue,
+                PassCode.PickCompilerEnvironments);
     }
 }

src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java

@@ -1,12 +0,0 @@
-package _VisualDVM.GlobalData.EnvironmentValue;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class EnvironmentValuesMenuBar extends DataMenuBar {
-    public EnvironmentValuesMenuBar() {
-        super("переменные окружения", PassCode.AddEnvironmentValue,
-                PassCode.EditEnvironmentValue,
-                PassCode.DeleteEnvironmentValue,
-                PassCode.PickCompilerEnvironments
-        );
-    }
-}

src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java

@@ -4,7 +4,9 @@ import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
+import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
@@ -19,7 +21,10 @@ import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.GlobalData.User.User;
+import _VisualDVM.Passes.PassCode;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.LinkedHashMap;
 public class MachinesDBTable extends iDBTable<Machine> {
     public MachinesDBTable() {
@@ -127,7 +132,25 @@ public class MachinesDBTable extends iDBTable<Machine> {
         return Data.values().stream().anyMatch(machine -> machine.type.equals(MachineType.Local));
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return MachinesMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.AddMachine,
+                PassCode.EditMachine,
+                PassCode.DeleteMachine){
+            {
+                add(new MenuBarButton() {
+                    {
+                        setIcon("/Common/icons/SilverArrowUp.png");
+                        setToolTipText("Свернуть");
+                        addActionListener(new ActionListener() {
+                            @Override
+                            public void actionPerformed(ActionEvent e) {
+                                Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
+                            }
+                        });
+                    }
+                }, 0);
+            }
+        };
     }
 }

src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java

@@ -1,29 +0,0 @@
-package _VisualDVM.GlobalData.Machine;
-import Common.Visual.Controls.MenuBarButton;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Global;
-import _VisualDVM.Passes.PassCode;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-public class MachinesMenuBar extends DataMenuBar {
-    MenuBarButton bCollapse;
-    public MachinesMenuBar() {
-        super("машины",
-                PassCode.AddMachine,
-                PassCode.EditMachine,
-                PassCode.DeleteMachine);
-        this.add(bCollapse = new MenuBarButton() {
-            {
-                setIcon("/Common/icons/SilverArrowUp.png");
-                setToolTipText("Свернуть");
-                addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
-                    }
-                });
-            }
-        }, 0);
-    }
-}

src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java

@@ -5,12 +5,14 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Module.Module;
 import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
 import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
+import _VisualDVM.Passes.PassCode;
 
 import java.util.LinkedHashMap;
 public class MakefilesDBTable extends iDBTable<Makefile> {
@@ -75,7 +77,15 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
         return Current.Makefile;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return MakefilesMenuBar.class;
+        return new DataMenuBar(getPluralDescription(), PassCode.Compile,
+                PassCode.AddMakefile,
+                PassCode.EditMakefile,
+                PassCode.DeleteMakefile){
+            {
+                addSeparator();
+                addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
+            }
+        };
     }
 }

src/_VisualDVM/GlobalData/Makefile/MakefilesMenuBar.java

@@ -1,14 +0,0 @@
-package _VisualDVM.GlobalData.Makefile;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class MakefilesMenuBar extends DataMenuBar {
-    public MakefilesMenuBar() {
-        super("мейкфайлы",
-                PassCode.Compile,
-                PassCode.AddMakefile,
-                PassCode.EditMakefile,
-                PassCode.DeleteMakefile);
-        addSeparator();
-        addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
-    }
-}

src/_VisualDVM/GlobalData/Module/ModulesDBTable.java

@@ -1,10 +1,12 @@
 package _VisualDVM.GlobalData.Module;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
+import _VisualDVM.Passes.PassCode;
 public class ModulesDBTable extends iDBTable<Module> {
     public ModulesDBTable() {
         super(Module.class);
@@ -63,7 +65,7 @@ public class ModulesDBTable extends iDBTable<Module> {
         return Current.Module;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return ModulesMenuBar.class;
+        return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
     }
 }

src/_VisualDVM/GlobalData/Module/ModulesMenuBar.java

@@ -1,8 +0,0 @@
-package _VisualDVM.GlobalData.Module;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class ModulesMenuBar extends DataMenuBar {
-    public ModulesMenuBar() {
-        super("языковые модули", PassCode.EditModule);
-    }
-}

src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java

@@ -6,6 +6,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
@@ -17,6 +18,7 @@ import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
 import _VisualDVM.GlobalData.RunConfiguration.UI.MatrixBar;
 import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationFields;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
+import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -167,7 +169,16 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
         }
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return RunConfigurationsMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.Run,
+                PassCode.AddRunConfiguration,
+                PassCode.EditRunConfiguration,
+                PassCode.DeleteRunConfiguration){
+            {
+                add(new JSeparator());
+                addPasses(PassCode.EditProjectRunMaxtime);
+            }
+        };
     }
 }

src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java

@@ -1,13 +0,0 @@
-package _VisualDVM.GlobalData.RunConfiguration;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-
-import javax.swing.*;
-public class RunConfigurationsMenuBar extends DataMenuBar {
-    public RunConfigurationsMenuBar() {
-        super("конфигурации запуска", PassCode.Run,
-                PassCode.AddRunConfiguration, PassCode.EditRunConfiguration, PassCode.DeleteRunConfiguration);
-        add(new JSeparator());
-        addPasses(PassCode.EditProjectRunMaxtime);
-    }
-}

src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java

@@ -5,10 +5,12 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfileFields;
 import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
+import _VisualDVM.Passes.PassCode;
 
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -17,6 +19,14 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
         super(SapforProfile.class);
     }
     @Override
+    public String getPluralDescription() {
+        return "профили SAPFOR";
+    }
+    @Override
+    public String getSingleDescription() {
+        return "профиль SAPFOR";
+    }
+    @Override
     protected DataSetControlForm createUI() {
         return new DataSetControlForm(this){
             @Override
@@ -71,7 +81,11 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
         return res;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return SapforProfilesMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.SaveProfile,
+                PassCode.EditProfile,
+                PassCode.ApplyProfile,
+                PassCode.DeleteProfile);
     }
 }

src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesMenuBar.java

@@ -1,8 +0,0 @@
-package _VisualDVM.GlobalData.SapforProfile;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class SapforProfilesMenuBar extends DataMenuBar {
-    public SapforProfilesMenuBar() {
-        super("профили", PassCode.SaveProfile, PassCode.EditProfile, PassCode.ApplyProfile, PassCode.DeleteProfile);
-    }
-}

src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java

@@ -7,6 +7,10 @@ public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting>
         super(SapforProfileSetting.class);
     }
     @Override
+    public boolean hasMenuBar() {
+        return false;
+    }
+    @Override
     protected DataSetControlForm createUI() {
         return new DataSetControlForm(this) {
             @Override

src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.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.Menus.TableMenu;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
@@ -112,7 +112,7 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
         return Current.CompilationTask;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return CompilationTasksMenuBar.class;
+        return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
     }
 }

src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java

@@ -1,8 +0,0 @@
-package _VisualDVM.GlobalData.Tasks.CompilationTask;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class CompilationTasksMenuBar extends DataMenuBar {
-    public CompilationTasksMenuBar() {
-        super("задачи на компиляцию", PassCode.DeleteCompilationTasks);
-    }
-}

src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java

@@ -1,7 +1,7 @@
 package _VisualDVM.GlobalData.Tasks.RunTask;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import Common.Visual.Menus.TableMenu;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
@@ -77,7 +77,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
         return Current.RunTask;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return RunTasksMenuBar.class;
+        return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
     }
 }

src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java

@@ -1,8 +0,0 @@
-package _VisualDVM.GlobalData.Tasks.RunTask;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class RunTasksMenuBar extends DataMenuBar {
-    public RunTasksMenuBar() {
-        super("задачи на запуск", PassCode.DeleteRunTasks);
-    }
-}

src/_VisualDVM/GlobalData/User/UsersDBTable.java

@@ -5,6 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererStatusEnum;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
@@ -13,6 +14,7 @@ import _VisualDVM.GlobalData.Machine.MachineType;
 import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
 import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.GlobalData.User.UI.UserFields;
+import _VisualDVM.Passes.PassCode;
 
 import java.util.LinkedHashMap;
 public class UsersDBTable extends iDBTable<User> {
@@ -115,7 +117,11 @@ public class UsersDBTable extends iDBTable<User> {
         return Current.User;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return UsersMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.AddUser,
+                PassCode.EditUser,
+                PassCode.InitialiseUser,
+                PassCode.DeleteUser);
     }
 }

src/_VisualDVM/GlobalData/User/UsersMenuBar.java

@@ -1,11 +0,0 @@
-package _VisualDVM.GlobalData.User;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class UsersMenuBar extends DataMenuBar {
-    public UsersMenuBar() {
-        super("пользователи", PassCode.AddUser,
-                PassCode.EditUser,
-                PassCode.InitialiseUser,
-                PassCode.DeleteUser);
-    }
-}

src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java

@@ -1,6 +1,8 @@
 package _VisualDVM.ProjectData.DBArray;
 import Common.Database.Tables.DBTable;
+import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import _VisualDVM.Current;
 public class ArraysDBTable extends DBTable<String, DBArray> {
     public ArraysDBTable() {
@@ -47,7 +49,12 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
         return Current.DBArray;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return DBArraysMenuBar.class;
+        return new DataMenuBar(getPluralDescription()){
+            @Override
+            public void createSelectionButtons(DataSet dataSet) {
+                //не нужны.
+            }
+        };
     }
 }

src/_VisualDVM/ProjectData/DBArray/DBArraysMenuBar.java

@@ -1,12 +0,0 @@
-package _VisualDVM.ProjectData.DBArray;
-import Common.Database.Tables.DataSet;
-import Common.Visual.Menus.DataMenuBar;
-public class DBArraysMenuBar extends DataMenuBar {
-    public DBArraysMenuBar() {
-        super("сохранённые состояния");
-    }
-    @Override
-    public void createSelectionButtons(DataSet dataSet) {
-        //не нужны.
-    }
-}

src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java

@@ -76,4 +76,8 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
     public Comparator<M> getComparator() {
         return Comparator.comparingInt(o -> o.line);
     }
+    @Override
+    public boolean hasMenuBar() {
+        return false;
+    }
 }

src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java

@@ -21,9 +21,14 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
                 columns.get(1).setMinWidth(700);
                 columns.get(1).setRendererClass(RendererWrapText.class);
             }
+
         };
     }
     @Override
+    public boolean hasMenuBar() {
+        return false;
+    }
+    @Override
     public String[] getUIColumnNames() {
         return new String[]{"текст"};
     }

src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysMenuBar.java

@@ -1,7 +0,0 @@
-package _VisualDVM.ProjectData.SapforData.Arrays;
-import Common.Visual.Menus.DataMenuBar;
-public class ArraysMenuBar extends DataMenuBar {
-    public ArraysMenuBar() {
-        super("массивы");
-    }
-}

src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java

@@ -1,6 +1,7 @@
 package _VisualDVM.ProjectData.SapforData.Arrays;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererHiddenList;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
@@ -77,8 +78,4 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
     public void CheckAll(boolean flag) {
         Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));
     }
-    @Override
-    public Class getMenuBarClass() {
-        return ArraysMenuBar.class;
-    }
 }

src/_VisualDVM/ProjectData/SapforData/Regions/RegionsMenuBar.java

@@ -1,7 +0,0 @@
-package _VisualDVM.ProjectData.SapforData.Regions;
-import Common.Visual.Menus.DataMenuBar;
-public class RegionsMenuBar extends DataMenuBar {
-    public RegionsMenuBar() {
-        super("области распараллеливания");
-    }
-}

src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java

@@ -1,6 +1,7 @@
 package _VisualDVM.ProjectData.SapforData.Regions;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererMultiline;
 import Common.Visual.Tables.RendererTopLeft;
 import _VisualDVM.Current;
@@ -60,8 +61,4 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
     public String[] getUIColumnNames() {
         return new String[]{"Имя", "Строк кода", "Массивов", "Циклов", "Объявлений процедур", "Вызовов процедур", "Фрагменты"};
     }
-    @Override
-    public Class getMenuBarClass() {
-        return RegionsMenuBar.class;
-    }
 }

src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java

@@ -1,12 +1,13 @@
 package _VisualDVM.ProjectData.SapforData.Variants;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererMaskedNanInteger;
 import Common.Visual.Tables.RendererMultiline;
 import _VisualDVM.Current;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.SapforData.Variants.UI.RendererVariantRank;
-import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
 public class VariantsSet extends DataSet<String, ParallelVariant> {
     public VariantsSet() {
         super(String.class, ParallelVariant.class);
@@ -74,7 +75,11 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
         return Current.ParallelVariant;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return VariantsMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.ShowAllParallelVariants,
+                PassCode.ShowParallelVariantsCoverage,
+                PassCode.PredictParallelVariants,
+                PassCode.CreateParallelVariants);
     }
 }

src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java

@@ -1,6 +1,7 @@
 package _VisualDVM.Repository.BugReport;
 import Common.Database.Tables.DBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererProgressBar;
 import Common.Visual.Tables.RendererStatusEnum;
@@ -113,7 +114,16 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
         return Data.values().stream().filter(bugReport -> bugReport.state.equals(BugReportState.draft)).collect(Collectors.toCollection(Vector::new));
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return BugReportsMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.SynchronizeBugReports,
+                PassCode.DownloadAllBugReportsArchives,
+                PassCode.AddBugReport,
+                PassCode.PublishBugReport,
+                PassCode.OpenBugReportTestProject,
+                PassCode.OpenBugReport,
+                PassCode.UpdateBugReportProgress,
+                PassCode.CloseBugReport,
+                PassCode.DeleteBugReport);
     }
 }

src/_VisualDVM/Repository/BugReport/BugReportsMenuBar.java

@@ -1,17 +0,0 @@
-package _VisualDVM.Repository.BugReport;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class BugReportsMenuBar extends DataMenuBar {
-    public BugReportsMenuBar() {
-        super("отчёты об ошибках",
-                PassCode.SynchronizeBugReports,
-                PassCode.DownloadAllBugReportsArchives,
-                PassCode.AddBugReport,
-                PassCode.PublishBugReport,
-                PassCode.OpenBugReportTestProject,
-                PassCode.OpenBugReport,
-                PassCode.UpdateBugReportProgress,
-                PassCode.CloseBugReport,
-                PassCode.DeleteBugReport);
-    }
-}

src/_VisualDVM/Repository/Component/ComponentsSet.java

@@ -1,10 +1,15 @@
 package _VisualDVM.Repository.Component;
 import Common.Database.Tables.DataSet;
+import Common.MainModule_;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Fonts.VisualiserFonts;
+import Common.Visual.Menus.DataMenuBar;
+import Common.Visual.Menus.VisualiserMenu;
 import Common.Visual.Tables.RendererMaskedNanInteger;
 import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
-import _VisualDVM.Visual.Menus.ComponentsMenuBar;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
 
 import java.util.Vector;
 public class ComponentsSet extends DataSet<ComponentType, Component> {
@@ -86,7 +91,24 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
         return target;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return ComponentsMenuBar.class;
+        return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
+                PassCode.UpdateSelectedComponents,
+                PassCode.PublishComponent,
+                PassCode.ShowComponentChangesLog){
+            {
+                addMenus(
+                        new VisualiserMenu(
+                                "Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
+                            {
+                                setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
+                                add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
+                                add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
+                            }
+                        }
+                );
+                Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
+            }
+        };
     }
 }

src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java

@@ -1,7 +1,9 @@
 package _VisualDVM.Repository.SubscriberWorkspace;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import _VisualDVM.Current;
+import _VisualDVM.Passes.PassCode;
 public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
     public SubscriberWorkspaceDBTable() {
         super(SubscriberWorkspace.class);
@@ -47,7 +49,7 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
         return null;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return SubscriberWorkspacesMenuBar.class;
+        return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
     }
 }

src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java

@@ -1,8 +0,0 @@
-package _VisualDVM.Repository.SubscriberWorkspace;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class SubscriberWorkspacesMenuBar extends DataMenuBar {
-    public SubscriberWorkspacesMenuBar() {
-        super("рабочие пространства", PassCode.DeleteSubscriberWorkspace);
-    }
-}

src/_VisualDVM/Repository/Subscribes/SubscribersMenuBar.java

@@ -1,13 +0,0 @@
-package _VisualDVM.Repository.Subscribes;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class SubscribersMenuBar extends DataMenuBar {
-    public SubscribersMenuBar() {
-        super("Адресаты",
-                PassCode.SaveBugReportExecutor,
-                PassCode.SaveBugReportRecipients,
-                PassCode.AddSubscriber,
-                PassCode.EditSubscriber,
-                PassCode.DeleteSubscriber);
-    }
-}

src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java

@@ -5,10 +5,12 @@ import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.AccountRole;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;
 import _VisualDVM.Repository.Subscribes.UI.SubscriberForm;
@@ -20,7 +22,11 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
     }
     @Override
     public String getSingleDescription() {
-        return "Адресат";
+        return "адресат";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "адресаты";
     }
     @Override
     protected DataSetControlForm createUI() {
@@ -71,7 +77,12 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
         return res;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return SubscribersMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.SaveBugReportExecutor,
+                PassCode.SaveBugReportRecipients,
+                PassCode.AddSubscriber,
+                PassCode.EditSubscriber,
+                PassCode.DeleteSubscriber);
     }
 }

src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java

@@ -4,17 +4,25 @@ import Common.Database.Tables.FKBehaviour;
 import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
+import Common.Utils.Utils_;
+import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DBObjectFilter;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.DataSetFilter;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.LanguageName;
+import _VisualDVM.TestingSystem.Common.Group.UI.AddGroupMenu;
+import _VisualDVM.TestingSystem.Common.Group.UI.EditGroupMenu;
 import _VisualDVM.TestingSystem.Common.Group.UI.GroupFields;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.Test.TestType;
 
+import javax.swing.*;
 import java.util.LinkedHashMap;
 //-
 public class GroupsDBTable extends iDBTable<Group> {
@@ -146,7 +154,30 @@ public class GroupsDBTable extends iDBTable<Group> {
         return null;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return GroupsMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.SynchronizeTests,
+                PassCode.ConvertCorrectnessTests){
+            {
+                addMenus(new AddGroupMenu(), new EditGroupMenu());
+                addPasses(PassCode.DeleteGroup);
+                add(new JSeparator());
+                add(new MenuBarButton() {
+                    {
+                        setText("Свои");
+                        setToolTipText("Отображать только группы тестов авторства пользователя");
+                        Mark();
+                        addActionListener(e -> {
+                            GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
+                            Mark();
+                            Global.testingServer.db.groups.ShowUI();
+                        });
+                    }
+                    public void Mark() {
+                        setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                    }
+                });
+            }
+        };
     }
 }

src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java

@@ -1,36 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Group;
-import Common.Utils.Utils_;
-import Common.Visual.Controls.MenuBarButton;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Global;
-import _VisualDVM.Passes.PassCode;
-import _VisualDVM.TestingSystem.Common.Group.UI.AddGroupMenu;
-import _VisualDVM.TestingSystem.Common.Group.UI.EditGroupMenu;
-
-import javax.swing.*;
-public class GroupsMenuBar extends DataMenuBar {
-    public GroupsMenuBar() {
-        super("группы",
-                PassCode.SynchronizeTests,
-                PassCode.ConvertCorrectnessTests
-        );
-        addMenus(new AddGroupMenu(), new EditGroupMenu());
-        addPasses(PassCode.DeleteGroup);
-        add(new JSeparator());
-        add(new MenuBarButton() {
-            {
-                setText("Свои");
-                setToolTipText("Отображать только группы тестов авторства пользователя");
-                Mark();
-                addActionListener(e -> {
-                    GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
-                    Mark();
-                    Global.testingServer.db.groups.ShowUI();
-                });
-            }
-            public void Mark() {
-                setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-            }
-        });
-    }
-}

src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java

@@ -1,10 +1,14 @@
 package _VisualDVM.TestingSystem.Common.Test;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.Common.Group.Group;
+import _VisualDVM.TestingSystem.Common.Test.UI.AddTestMenu;
+import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu;
 import _VisualDVM.TestingSystem.Common.Test.UI.TestFields;
 
 import java.util.Vector;
@@ -14,7 +18,7 @@ public class TestDBTable extends iDBTable<Test> {
     }
     @Override
     public String getSingleDescription() {
-        return "тест DVM";
+        return "тест";
     }
     @Override
     public String getPluralDescription() {
@@ -125,7 +129,12 @@ public class TestDBTable extends iDBTable<Test> {
         return selectedTests.isEmpty() ? allTests : selectedTests;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return TestsMenuBar.class;
+        return new DataMenuBar(getPluralDescription()){
+            {
+                addMenus(new AddTestMenu(), new EditTestMenu());
+                addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
+            }
+        };
     }
 }

src/_VisualDVM/TestingSystem/Common/Test/TestsMenuBar.java

@@ -1,12 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Test;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-import _VisualDVM.TestingSystem.Common.Test.UI.AddTestMenu;
-import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu;
-public class TestsMenuBar extends DataMenuBar {
-    public TestsMenuBar() {
-        super("тесты");
-        addMenus(new AddTestMenu(), new EditTestMenu());
-        addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
-    }
-}

src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java

@@ -2,10 +2,12 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererMultiline;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
@@ -19,11 +21,11 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
     }
     @Override
     public String getSingleDescription() {
-        return "конфигурация тестирования DVM системы";
+        return "конфигурация";
     }
     @Override
     public String getPluralDescription() {
-        return "конфигурации тестирования DVM системы";
+        return "конфигурации";
     }
     @Override
     protected DataSetControlForm createUI() {
@@ -115,7 +117,13 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
         return (Global.mainModule.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return DVMConfigurationsMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.PublishConfiguration,
+                PassCode.EditConfiguration,
+                PassCode.ShowCurrentDVMConfigurationTests,
+                PassCode.SaveCurrentDVMConfiguration,
+                PassCode.DeleteConfiguration,
+                PassCode.StartSelectedDVMConfigurations );
     }
 }

src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java

@@ -1,16 +0,0 @@
-package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class DVMConfigurationsMenuBar extends DataMenuBar {
-    public DVMConfigurationsMenuBar() {
-        super("конфигурации");
-        addPasses(
-                PassCode.PublishConfiguration,
-                PassCode.EditConfiguration,
-                PassCode.ShowCurrentDVMConfigurationTests,
-                PassCode.SaveCurrentDVMConfiguration,
-                PassCode.DeleteConfiguration,
-                PassCode.StartSelectedDVMConfigurations
-        );
-    }
-}

src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java

@@ -1,6 +1,9 @@
 package _VisualDVM.TestingSystem.DVM.DVMPackage;
 import Common.Database.Tables.iDBTable;
+import Common.Utils.Utils_;
+import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererMultiline;
 import Common.Visual.Tables.RendererProgressBar;
@@ -11,6 +14,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 
+import javax.swing.*;
 import java.util.Comparator;
 import java.util.Date;
 public class DVMPackageDBTable extends iDBTable<DVMPackage> {
@@ -25,11 +29,11 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     }
     @Override
     public String getSingleDescription() {
-        return "пакет задач DVM";
+        return "пакет";
     }
     @Override
     public String getPluralDescription() {
-        return "пакеты задач DVM";
+        return "пакеты";
     }
     @Override
     protected DataSetControlForm createUI() {
@@ -123,7 +127,48 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
         // return Comparator.comparingInt(o -> o.).reversed();
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return DVMPackagesBar.class;
+        return new DataMenuBar(getPluralDescription()){
+            {
+                addPasses(PassCode.SynchronizeTests);
+                addSeparator();
+                addPasses(PassCode.AbortDVMPackage);
+                addSeparator();
+                addPasses(PassCode.DownloadDVMPackage,
+                        PassCode.ExportDVMPackageToExcel,
+                        PassCode.DeleteDVMPackage);
+                add(new JSeparator());
+                add(new MenuBarButton() {
+                    {
+                        setText("Свои");
+                        setToolTipText("Отображать только пакеты тестов авторства пользователя");
+                        Mark();
+                        addActionListener(e -> {
+                            DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
+                            Mark();
+                            Global.testingServer.db.dvmPackages.ShowUI();
+                        });
+                    }
+                    public void Mark() {
+                        setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                    }
+                });
+                add(new MenuBarButton() {
+                    {
+                        setText("Активные");
+                        setToolTipText("Отображать только активные пакеты тестов");
+                        Mark();
+                        addActionListener(e -> {
+                            DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
+                            Mark();
+                            Global.testingServer.db.dvmPackages.ShowUI();
+                        });
+                    }
+                    public void Mark() {
+                        setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                    }
+                });
+            }
+        };
     }
 }

src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java

@@ -1,51 +0,0 @@
-package _VisualDVM.TestingSystem.DVM.DVMPackage;
-import Common.Utils.Utils_;
-import Common.Visual.Controls.MenuBarButton;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Global;
-import _VisualDVM.Passes.PassCode;
-
-import javax.swing.*;
-public class DVMPackagesBar extends DataMenuBar {
-    public DVMPackagesBar() {
-        super("пакеты задач DVM");
-        addPasses(PassCode.SynchronizeTests);
-        addSeparator();
-        addPasses(PassCode.AbortDVMPackage);
-        addSeparator();
-        addPasses(PassCode.DownloadDVMPackage,
-                PassCode.ExportDVMPackageToExcel,
-                PassCode.DeleteDVMPackage);
-        add(new JSeparator());
-        add(new MenuBarButton() {
-            {
-                setText("Свои");
-                setToolTipText("Отображать только пакеты тестов авторства пользователя");
-                Mark();
-                addActionListener(e -> {
-                    DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
-                    Mark();
-                    Global.testingServer.db.dvmPackages.ShowUI();
-                });
-            }
-            public void Mark() {
-                setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-            }
-        });
-        add(new MenuBarButton() {
-            {
-                setText("Активные");
-                setToolTipText("Отображать только активные пакеты тестов");
-                Mark();
-                addActionListener(e -> {
-                    DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
-                    Mark();
-                    Global.testingServer.db.dvmPackages.ShowUI();
-                });
-            }
-            public void Mark() {
-                setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-            }
-        });
-    }
-}

src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java

@@ -2,10 +2,11 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
-import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
 public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
     public DVMSettingsDBTable() {
@@ -17,11 +18,11 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
     }
     @Override
     public String getSingleDescription() {
-        return "параметры тестирования DVM системы";
+        return "параметры тестирования";
     }
     @Override
     public String getPluralDescription() {
-        return "параметры тестирования DVM системы";
+        return "параметры тестирования";
     }
     //--
     @Override
@@ -146,7 +147,11 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
         return (Global.mainModule.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return DVMSettingsBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.PublishDVMSettings,
+                PassCode.CloneDVMSettings,
+                PassCode.EditDVMSettings,
+                PassCode.DeleteDVMSettings);
     }
 }

src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java

@@ -1,13 +0,0 @@
-package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class DVMSettingsBar extends DataMenuBar {
-    public DVMSettingsBar() {
-        super("параметры тестированя",
-                PassCode.PublishDVMSettings,
-                PassCode.CloneDVMSettings,
-                PassCode.EditDVMSettings,
-                PassCode.DeleteDVMSettings
-        );
-    }
-}

src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java

@@ -1,9 +0,0 @@
-package _VisualDVM.TestingSystem.DVM.DVMTasks;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class DVMRunTasksBar extends DataMenuBar {
-    public DVMRunTasksBar() {
-        super("задачи",
-                PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
-    }
-}

src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java

@@ -3,10 +3,12 @@ import Common.Database.Tables.DataSet;
 import Common.Visual.DBObjectFilter;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.DataSetFilter;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererProgressBar;
 import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
 import _VisualDVM.GlobalData.Tasks.TaskState;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 
 import java.util.Comparator;
@@ -162,7 +164,7 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
         // return Comparator.comparingInt(o -> o.).reversed();
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return DVMRunTasksBar.class;
+        return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
     }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java

@@ -2,9 +2,11 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
 import Common.Database.Tables.iDBTable;
 import Common.Utils.Vector_;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererMultiline;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
@@ -22,7 +24,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
     }
     @Override
     public String getSingleDescription() {
-        return "конфигурация тестирования SAPFOR";
+        return "конфигурация";
     }
     @Override
     public String getPluralDescription() {
@@ -129,7 +131,13 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
         return null;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return SapforConfigurationsMenuBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.PublishSapforConfiguration,
+                PassCode.EditSapforConfiguration,
+                PassCode.ShowCurrentSAPFORConfigurationTests,
+                PassCode.SaveCurrentSAPFORConfiguration,
+                PassCode.DeleteSapforConfiguration,
+                PassCode.StartSelectedSAPFORConfigurations);
     }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java

@@ -1,15 +0,0 @@
-package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class SapforConfigurationsMenuBar extends DataMenuBar {
-    public SapforConfigurationsMenuBar() {
-        super("конфигурации",
-                PassCode.PublishSapforConfiguration,
-                PassCode.EditSapforConfiguration,
-                PassCode.ShowCurrentSAPFORConfigurationTests,
-                PassCode.SaveCurrentSAPFORConfiguration,
-                PassCode.DeleteSapforConfiguration,
-                PassCode.StartSelectedSAPFORConfigurations
-        );
-    }
-}

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java

@@ -1,6 +1,9 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforPackage;
 import Common.Database.Tables.iDBTable;
+import Common.Utils.Utils_;
+import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererMultiline;
 import Common.Visual.Tables.RendererProgressBar;
@@ -10,8 +13,8 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.PackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
-import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
 
+import javax.swing.*;
 import java.util.Comparator;
 import java.util.Date;
 public class SapforPackageDBTable extends iDBTable<SapforPackage> {
@@ -26,11 +29,11 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
     }
     @Override
     public String getSingleDescription() {
-        return "пакет задач SAPFOR";
+        return "пакет";
     }
     @Override
     public String getPluralDescription() {
-        return "пакеты задач SAPFOR";
+        return "пакеты";
     }
     @Override
     protected DataSetControlForm createUI() {
@@ -104,7 +107,47 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
         // return Comparator.comparingInt(o -> o.).reversed();
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return SapforPackagesBar.class;
+        return new DataMenuBar(getPluralDescription(),PassCode.SynchronizeTests){
+            {
+                addSeparator();
+                addPasses(PassCode.AbortSapforPackage);
+                addSeparator();
+                addPasses(PassCode.CompareSapforPackages);
+                addSeparator();
+                addPasses(PassCode.DeleteSapforPackage);
+                add(new JSeparator());
+                add(new MenuBarButton() {
+                    {
+                        setText("Свои");
+                        setToolTipText("Отображать только пакеты тестов авторства пользователя");
+                        Mark();
+                        addActionListener(e -> {
+                            SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
+                            Mark();
+                            Global.testingServer.db.sapforPackages.ShowUI();
+                        });
+                    }
+                    public void Mark() {
+                        setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                    }
+                });
+                add(new MenuBarButton() {
+                    {
+                        setText("Активные");
+                        setToolTipText("Отображать только активные пакеты тестов");
+                        Mark();
+                        addActionListener(e -> {
+                            SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
+                            Mark();
+                            Global.testingServer.db.sapforPackages.ShowUI();
+                        });
+                    }
+                    public void Mark() {
+                        setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
+                    }
+                });
+            }
+        };
     }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java

@@ -1,13 +0,0 @@
-package _VisualDVM.TestingSystem.SAPFOR.SapforSettings;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class SapforSettingsBar extends DataMenuBar {
-    public SapforSettingsBar() {
-        super("параметры тестирования",
-                PassCode.PublishSapforSettings,
-                PassCode.CloneSapforSettings,
-                PassCode.EditSapforSettings,
-                PassCode.DeleteSapforSettings
-        );
-    }
-}

src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java

@@ -6,8 +6,10 @@ import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Utils.Utils_;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
+import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsFields;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
 
@@ -22,11 +24,11 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
     }
     @Override
     public String getSingleDescription() {
-        return "параметры тестирования системы SAPFOR";
+        return "параметры тестирования";
     }
     @Override
     public String getPluralDescription() {
-        return "параметры тестирования системы SAPFOR";
+        return "параметры тестирования";
     }
     @Override
     protected DataSetControlForm createUI() {
@@ -116,7 +118,11 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
         return res;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return SapforSettingsBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.PublishSapforSettings,
+                PassCode.CloneSapforSettings,
+                PassCode.EditSapforSettings,
+                PassCode.DeleteSapforSettings);
     }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java

@@ -1,12 +0,0 @@
-package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class SapforSettingsCommandsBar extends DataMenuBar {
-    public SapforSettingsCommandsBar() {
-        super("команды",
-                PassCode.PublishSapforSettingsCommand,
-                PassCode.EditSapforSettingsCommand,
-                PassCode.DeleteSapforSettingsCommand
-        );
-    }
-}

src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java

@@ -1,6 +1,7 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Current;
@@ -82,7 +83,10 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
         return res;
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return SapforSettingsCommandsBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.PublishSapforSettingsCommand,
+                PassCode.EditSapforSettingsCommand,
+                PassCode.DeleteSapforSettingsCommand);
     }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java

@@ -1,52 +0,0 @@
-package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
-import Common.Utils.Utils_;
-import Common.Visual.Controls.MenuBarButton;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Global;
-import _VisualDVM.Passes.PassCode;
-import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
-
-import javax.swing.*;
-public class SapforPackagesBar extends DataMenuBar {
-    public SapforPackagesBar() {
-        super("пакеты задач SAPFOR");
-        addPasses(PassCode.SynchronizeTests);
-        addSeparator();
-        addPasses(PassCode.AbortSapforPackage);
-        addSeparator();
-        addPasses(PassCode.CompareSapforPackages);
-        addSeparator();
-        addPasses(PassCode.DeleteSapforPackage);
-        add(new JSeparator());
-        add(new MenuBarButton() {
-            {
-                setText("Свои");
-                setToolTipText("Отображать только пакеты тестов авторства пользователя");
-                Mark();
-                addActionListener(e -> {
-                    SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
-                    Mark();
-                    Global.testingServer.db.sapforPackages.ShowUI();
-                });
-            }
-            public void Mark() {
-                setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-            }
-        });
-        add(new MenuBarButton() {
-            {
-                setText("Активные");
-                setToolTipText("Отображать только активные пакеты тестов");
-                Mark();
-                addActionListener(e -> {
-                    SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
-                    Mark();
-                    Global.testingServer.db.sapforPackages.ShowUI();
-                });
-            }
-            public void Mark() {
-                setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
-            }
-        });
-    }
-}

src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java

@@ -1,13 +0,0 @@
-package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class ServerSapforsBar extends DataMenuBar {
-    public ServerSapforsBar() {
-        super("версии SAPFOR",
-                PassCode.CompileServerSapfor,
-                PassCode.ShowSapforCompilationOut,
-                PassCode.ShowSapforCompilationErr,
-                PassCode.DeleteServerSapfor
-        );
-    }
-}

src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java

@@ -1,10 +1,12 @@
 package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.RendererDate;
 import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
 
 import java.util.Comparator;
 public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
@@ -13,11 +15,11 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
     }
     @Override
     public String getSingleDescription() {
-        return "SAPFOR";
+        return "версия SAPFOR";
     }
     @Override
     public String getPluralDescription() {
-        return "SAPFOR";
+        return "версии SAPFOR";
     }
     @Override
     public Current CurrentName() {
@@ -73,7 +75,11 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
         // return Comparator.comparingInt(o -> o.).reversed();
     }
     @Override
-    public Class getMenuBarClass() {
+    public DataMenuBar createMenuBar() {
-        return ServerSapforsBar.class;
+        return new DataMenuBar(getPluralDescription(),
+                PassCode.CompileServerSapfor,
+                PassCode.ShowSapforCompilationOut,
+                PassCode.ShowSapforCompilationErr,
+                PassCode.DeleteServerSapfor);
     }
 }

src/_VisualDVM/Visual/Menus/ComponentsMenuBar.java

@@ -1,27 +0,0 @@
-package _VisualDVM.Visual.Menus;
-import Common.MainModule_;
-import Common.Visual.Fonts.VisualiserFonts;
-import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.Menus.VisualiserMenu;
-import _VisualDVM.Global;
-import _VisualDVM.Passes.PassCode;
-public class ComponentsMenuBar extends DataMenuBar {
-    public ComponentsMenuBar() {
-        super("компоненты");
-        addMenus(
-                new VisualiserMenu(
-                        "Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
-                    {
-                        setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
-                        add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
-                        add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
-                    }
-                }
-        );
-        addPasses(PassCode.InstallComponentFromFolder,
-                PassCode.UpdateSelectedComponents,
-                PassCode.PublishComponent,
-                PassCode.ShowComponentChangesLog);
-        Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
-    }
-}

src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java

@@ -1,10 +0,0 @@
-package _VisualDVM.Visual.Menus.VariantsMenuBar;
-import Common.Visual.Menus.DataMenuBar;
-import _VisualDVM.Passes.PassCode;
-public class VariantsMenuBar extends DataMenuBar {
-    public VariantsMenuBar() {
-        super("варианты");
-        addPasses(PassCode.ShowAllParallelVariants, PassCode.ShowParallelVariantsCoverage,
-                PassCode.PredictParallelVariants, PassCode.CreateParallelVariants);
-    }
-}