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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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_ {
public static MainModule_ instance = null; //текущий экземпляр. всегда один.
//--
- D db;
- Class db_class;
- LinkedHashMap objects; //Current
+ D db=null;
+ Class db_class=null;
+ LinkedHashMap objects=null; //Current
//--
- LinkedHashMap passes;
+ LinkedHashMap passes=null;
//--
U ui=null;
- Class ui_class;
- public U getUI(){
- return ui;
- }
+ Class ui_class=null;
+ MenuElement[] last_menu_path=null;
//--
public MainModule_(Class db_class_in, Class 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, DataMenuBar> menuBars = new LinkedHashMap<>();
public static Stack 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();