From bdbd49fa6de0374bad4b7ae8372cf4ed6f5d974a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 14 Oct 2024 18:52:44 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 51 +------------------
 src/Common/MainModule_.java                   | 27 +++++-----
 .../Visual/Controls/StableMenuItem.java       |  7 +--
 src/Common/Visual/UI_.java                    |  1 -
 src/_VisualDVM/Global.java                    |  3 +-
 5 files changed, 21 insertions(+), 68 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d6ccdb49..4cafd345 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,58 +9,9 @@
     <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/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/HyperlinksStyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/HyperlinksStyledList.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/GraphTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/GraphTreeCellRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTreeCellRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StableMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StableMenuItem.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Visual/UI_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI_.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DropFastAccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DropFastAccess.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/MainModule_.java b/src/Common/MainModule_.java
index 54929ad7..9a12e674 100644
--- a/src/Common/MainModule_.java
+++ b/src/Common/MainModule_.java
@@ -6,9 +6,8 @@ import Common.Passes.Pass;
 import Common.Passes.PassCode_;
 import Common.Utils.TextLog;
 import Common.Visual.UIModule_;
-import Common.Visual.UI_;
-import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
 
+import javax.swing.*;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.Vector;
@@ -16,33 +15,37 @@ import java.util.Vector;
 public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModule_> {
     public static MainModule_ instance = null; //текущий экземпляр. всегда один.
     //--
-    D db;
-    Class<D> db_class;
-    LinkedHashMap<Current_, Object> objects;  //Current
+    D db=null;
+    Class<D> db_class=null;
+    LinkedHashMap<Current_, Object> objects=null;  //Current
     //--
-    LinkedHashMap<PassCode_, Pass> passes;
+    LinkedHashMap<PassCode_, Pass> passes=null;
     //--
     U ui=null;
-    Class<U> ui_class;
-    public U getUI(){
-        return ui;
-    }
+    Class<U> ui_class=null;
+    MenuElement[] last_menu_path=null;
     //--
     public MainModule_(Class<D> db_class_in, Class<U> ui_class_in) throws Exception {
         ui_class=ui_class_in;
         db_class = db_class_in;
         instance = this;
     }
-    public void Init() throws Exception{
+    public void CreateAll() throws Exception{
         if (ui_class!=null)
             ui=ui_class.newInstance();
         //--
-        createPasses();
+        createPasses();//System.out.println(
         //-
         objects = new LinkedHashMap<>();
     }
     //ИНТЕРФЕЙС
     public boolean hasUI(){return ui!=null;}
+    public U getUI(){
+        return ui;
+    }
+    public boolean hasLastMenuPath(){return  last_menu_path!=null;}
+    public MenuElement[] getLastMenuPath(){return last_menu_path;}
+    public MenuElement[] setLastMenuPath(MenuElement[] last_menu_path_in){return last_menu_path=last_menu_path_in;}
     //БАЗА ДАННЫХ И ТЕКУЩИЕ ОБЪЕКТЫ
     public D getDb() {
         return db;
diff --git a/src/Common/Visual/Controls/StableMenuItem.java b/src/Common/Visual/Controls/StableMenuItem.java
index 589e79ef..247c1f27 100644
--- a/src/Common/Visual/Controls/StableMenuItem.java
+++ b/src/Common/Visual/Controls/StableMenuItem.java
@@ -1,4 +1,5 @@
 package Common.Visual.Controls;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Menus.VisualiserMenuItem;
 import Common.Visual.UI_;
@@ -15,15 +16,15 @@ class StableItemUI extends BasicMenuItemUI {
     @Override
     protected void doClick(MenuSelectionManager msm) {
         menuItem.doClick(0);
-        if (UI_.last_menu_path != null)
-            MenuSelectionManager.defaultManager().setSelectedPath(UI_.last_menu_path);
+        if (MainModule_.instance.hasLastMenuPath())
+            MenuSelectionManager.defaultManager().setSelectedPath(MainModule_.instance.getLastMenuPath());
     }
 }
 public class StableMenuItem extends VisualiserMenuItem {
     {
         getModel().addChangeListener(e -> {
             if (getModel().isArmed() && isShowing())
-                UI_.last_menu_path = MenuSelectionManager.defaultManager().getSelectedPath();
+                MainModule_.instance.setLastMenuPath(MenuSelectionManager.defaultManager().getSelectedPath());
         });
     }
     public StableMenuItem(String text) {
diff --git a/src/Common/Visual/UI_.java b/src/Common/Visual/UI_.java
index c3ed8aff..2e26fdd8 100644
--- a/src/Common/Visual/UI_.java
+++ b/src/Common/Visual/UI_.java
@@ -13,7 +13,6 @@ import java.util.LinkedHashMap;
 import java.util.Stack;
 public class UI_ {
     public static boolean active = false; //есть ли интерфейс. в консольных версиях не нужен.
-    public static MenuElement[] last_menu_path; //для меню
     //---
     public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
     public static Stack<Component> windowsStack = new Stack<>();
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 334bd653..e31688ae 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -19,7 +19,6 @@ import _VisualDVM.TestingSystem.Common.TestingServer;
 import _VisualDVM.TestingSystem.DVM.LocalDVMTestingPlanner;
 import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
 import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
-import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
 import _VisualDVM.Visual.UI;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
@@ -225,7 +224,7 @@ public class Global {
         //-------------------------------->>
         UI_.active = true;
         mainModule = new MainModule();
-        mainModule.Init();
+        mainModule.CreateAll();
         //--
         CheckVisualiserDirectories();
         CreateLogAtComponentsPath();