no message

src/_VisualDVM/Visual/Windows/CallbackForm.java

@@ -372,13 +372,13 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
     public void setUserRights() {
         LockMyOnly();
         Global.mainModule.SetUserPassesAccess();
-        UI.testingBar.showServerAdminLabel(false);
+        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(false);
         adminLabel.setVisible(false);
     }
     private void setDeveloperRights() {
         UnlockMyOnly();
         Global.mainModule.SetDeveloperPassesAccess();
-        UI.testingBar.showServerAdminLabel(false);
+        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(false);
         adminLabel.setVisible(false);
     }
     @Override
@@ -386,7 +386,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         UnlockMyOnly();
         Global.mainModule.SetAdminPassesAccess();
         //--
-        UI.testingBar.showServerAdminLabel(true);
+        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(true);
         adminLabel.setVisible(true);
     }
     @Override

src/_VisualDVM/Visual/Windows/FileForm.java

@@ -67,6 +67,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
     private TreeForm arraysForm;
     //-
     private SPFEditor Body = null; //времянка? не очень красиво.
+    FileMenuBar fileMenuBar= null;
     //-
     public FileForm(DBProjectFile file_in) {
         LoadSplitters();
@@ -90,11 +91,11 @@ public class FileForm implements FileWindow, FormWithSplitters {
         ShowGCOVLog();
         ShowAllAnalyses();
         Body.addCaretListener(ce -> ShowCaretInfo());
-        editorPanel.add(UI.fileMenuBar = new FileMenuBar(Body), BorderLayout.NORTH);
+        editorPanel.add(fileMenuBar = new FileMenuBar(Body), BorderLayout.NORTH);
         ShowCaretInfo();
         Body.requestFocus();
         RefreshTabsNames();
-        UI.fileMenuBar.sToGo.addChangeListener(e -> Body.gotoLine((Integer) UI.fileMenuBar.sToGo.getValue()));
+        fileMenuBar.sToGo.addChangeListener(e -> Body.gotoLine((Integer) fileMenuBar.sToGo.getValue()));
         ShowProperties();
         Global.mainModule.getPass(PassCode.Save).setControlsEnabled(false);
         //-
@@ -122,11 +123,11 @@ public class FileForm implements FileWindow, FormWithSplitters {
             Body.setSyntaxEditingStyle(file.languageName.getStyleKey());
         Body.setCodeFoldingEnabled(true);
         Body.switching_language = false;
-        UI.fileMenuBar.ShowLanguage();
+        fileMenuBar.ShowLanguage();
     }
     @Override
     public void ShowType() {
-        UI.fileMenuBar.ShowType();
+        fileMenuBar.ShowType();
     }
     @Override
     public void ShowStyle() {
@@ -149,7 +150,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
             }
         }
         Body.switching_language = false;
-        UI.fileMenuBar.ShowStyle();
+        fileMenuBar.ShowStyle();
     }
     @Override
     public SPFEditorInterface getEditor() {
@@ -299,12 +300,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
         int new_current_line = Body.getCurrentLine();
         boolean line_changed = (new_current_line != current_file_line);
         current_file_line = new_current_line;
-        UI.fileMenuBar.sToGo.setModel(new SpinnerNumberModel(current_file_line,
+        fileMenuBar.sToGo.setModel(new SpinnerNumberModel(current_file_line,
                 1, Body.getLineCount(), 1
         ));
         //-
-        UI.fileMenuBar.ShowLinesCount();
-        UI.fileMenuBar.CurrentSymbolLabel.setText(String.valueOf(Body.getCurrentSymbol()));
+        fileMenuBar.ShowLinesCount();
+        fileMenuBar.CurrentSymbolLabel.setText(String.valueOf(Body.getCurrentSymbol()));
         //если выделяем строку из графа, то тоже надо отключиьт события.
         //чтобы по ней не начался поиск.
         if (events_on && line_changed) {

src/_VisualDVM/Visual/Windows/MainForm.java

@@ -1,13 +1,14 @@
 package _VisualDVM.Visual.Windows;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.TabToolBar;
-import Common.Visual.UI_;
 import Common.Visual.Windows.Form;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.Visual.Interface.*;
+import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
 import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
 import _VisualDVM.Visual.UI;
 
@@ -27,8 +28,9 @@ public class MainForm extends Form implements MainWindow {
     private JPanel Content;
     private JTabbedPane globalTabs;
     private JPanel mainPanel;
+    MainMenuBar mainMenuBar;
     public MainForm() {
-        mainPanel.add(UI.mainMenuBar, BorderLayout.NORTH);
+        mainPanel.add( mainMenuBar = new MainMenuBar(), BorderLayout.NORTH);
         InstallWelcomePanel();
         InstallCallbackPanel();
         InstallTestsPanel();
@@ -197,7 +199,7 @@ public class MainForm extends Form implements MainWindow {
     }
     @Override
     public void ShowUpdatesIcon() {
-        UI.mainMenuBar.ShowUpdatesIcon();
+        mainMenuBar.ShowUpdatesIcon();
     }
     @Override
     public void FocusProject() {
@@ -233,7 +235,7 @@ public class MainForm extends Form implements MainWindow {
         getTestsWindow().ShowAll();
         if (getTestingWindow() != null)
             getTestingWindow().ShowAll();
-        UI_.windowsStack.push(this);
+        MainModule_.instance.getUI().windowsStack.push(this);
         super.Show();
     }
     @Override
@@ -244,7 +246,7 @@ public class MainForm extends Form implements MainWindow {
         InstallProjectPanel();
         restoreGlobalTab();
         UI.getDebugWindow().DropCompilationTasksComparison();
-        UI.mainMenuBar.ShowProject(true);
+        mainMenuBar.ShowProject(true);
     }
     @Override
     public void ShowNoProject() {
@@ -253,6 +255,6 @@ public class MainForm extends Form implements MainWindow {
         RemoveProjectPanel();
         InstallWelcomePanel();
         restoreGlobalTab();
-        UI.mainMenuBar.ShowProject(false);
+        mainMenuBar.ShowProject(false);
     }
 }

src/_VisualDVM/Visual/Windows/TestingForm.java

@@ -97,7 +97,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     };
     //--
     public TestingForm() {
-        content.add(UI.testingBar, BorderLayout.NORTH);
+        content.add(Global.mainModule.getUI().getTestingMenuBar(), BorderLayout.NORTH);
         LoadSplitters();
         //-
         dvmTestingRunMaster = new DVMRunTasksComparisonForm(dvmTestingRunSlave = new DVMRunTasksComparisonForm(null));
@@ -313,7 +313,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public void CollapseCredentials() {
         Global.mainModule.getDb().splitters.get("SC71").position = SC71.getDividerLocation();
         UI_.Clear(credentialsPanel);
-        credentialsPanel.add(UI.credentialsBar);
+        credentialsPanel.add(Global.mainModule.getUI().getCredentialsMenuBar());
         SC71.setDividerLocation(30);
         SC71.setDividerSize(0);
         credentialsPanel.revalidate();

src/_VisualDVM/Visual/Windows/VersionsForm.java

@@ -1,6 +1,8 @@
 package _VisualDVM.Visual.Windows;
+import Common.MainModule_;
 import Common.Visual.Trees.TreeForm;
 import Common.Visual.UI_;
+import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Project.UI.VersionsTree;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.Visual.Interface.FormWithSplitters;
@@ -34,7 +36,7 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow {
         versionsTreeForm.Show();
         //-
         versionsTabs.setEnabledAt(0, false);
-        versionsPanel.add(UI.versionsMenuBar, BorderLayout.NORTH);
+        versionsPanel.add(Global.mainModule.getUI().getVersionsMenuBar(), BorderLayout.NORTH);
     }
     private void createUIComponents() {
         // TODO: place custom component creation code here