no message
This commit is contained in:
@@ -5,18 +5,17 @@ import Common.Database.VisualiserDatabase;
|
||||
import Common.Passes.Pass;
|
||||
import Common.Passes.PassCode_;
|
||||
import Common.Utils.TextLog;
|
||||
import Common.Visual.Windows.PassForm;
|
||||
import Common.Visual.UIModule_;
|
||||
import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Vector;
|
||||
//Основной объект визуализатора.
|
||||
public abstract class MainModule_<D extends VisualiserDatabase> {
|
||||
public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModule_> {
|
||||
public static MainModule_ instance = null; //текущий экземпляр. всегда один.
|
||||
//--
|
||||
public FastAccessMenuBar fastAccessMenuBar = null;
|
||||
public PassForm passForm = null;
|
||||
//--
|
||||
D db;
|
||||
Class<D> db_class;
|
||||
@@ -24,18 +23,24 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
|
||||
//--
|
||||
LinkedHashMap<PassCode_, Pass> passes;
|
||||
//--
|
||||
public MainModule_(Class<D> db_class_in) {
|
||||
objects = new LinkedHashMap<>();
|
||||
createPasses();
|
||||
try {
|
||||
db_class = db_class_in;
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
//---
|
||||
instance = this;
|
||||
System.out.println("main module created");
|
||||
U ui=null;
|
||||
Class<U> ui_class;
|
||||
public U getUI(){
|
||||
return ui;
|
||||
}
|
||||
//--
|
||||
public MainModule_(Class<D> db_class_in, Class<U> ui_class_in) throws Exception {
|
||||
objects = new LinkedHashMap<>();
|
||||
db_class = db_class_in;
|
||||
createPasses();
|
||||
ui_class=ui_class_in;
|
||||
//---
|
||||
if (ui_class!=null)
|
||||
ui = ui_class_in.newInstance();
|
||||
instance = this;
|
||||
}
|
||||
//ИНТЕРФЕЙС
|
||||
public boolean hasUI(){return ui!=null;}
|
||||
//БАЗА ДАННЫХ И ТЕКУЩИЕ ОБЪЕКТЫ
|
||||
public D getDb() {
|
||||
return db;
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
package Common;
|
||||
public enum Mode {
|
||||
Undefined,
|
||||
Normal,
|
||||
Server,
|
||||
Testing,
|
||||
Package,
|
||||
MachineQueue,
|
||||
LocalMachineQueue
|
||||
}
|
||||
@@ -266,10 +266,10 @@ public class Pass<T> {
|
||||
animation_sem.acquire();
|
||||
//---
|
||||
form = null;
|
||||
MainModule_.instance.passForm = null;
|
||||
MainModule_.instance.getUI().DropPassForm();;
|
||||
System.gc();
|
||||
//--
|
||||
MainModule_.instance.passForm = form = new PassForm(this);
|
||||
form = MainModule_.instance.getUI().SetPassForm(new PassForm(this));
|
||||
dispatcher = new SwingWorker() {
|
||||
@Override
|
||||
protected Object doInBackground() {
|
||||
|
||||
11
src/Common/Visual/UIModule_.java
Normal file
11
src/Common/Visual/UIModule_.java
Normal file
@@ -0,0 +1,11 @@
|
||||
package Common.Visual;
|
||||
import Common.Visual.Windows.PassForm;
|
||||
public class UIModule_ {
|
||||
PassForm passForm = null;//текущая форма прохода. нужна для
|
||||
public boolean HasPassForm(){return passForm!=null;}
|
||||
public PassForm GetPassForm(){return passForm;}
|
||||
public PassForm SetPassForm(PassForm passForm_in){
|
||||
return passForm = passForm_in;
|
||||
}
|
||||
public void DropPassForm(){passForm=null;}
|
||||
}
|
||||
Reference in New Issue
Block a user