no message
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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<>();
|
||||
|
||||
Reference in New Issue
Block a user