перенос проходов в центральный модуль
This commit is contained in:
@@ -37,7 +37,7 @@ public class CompilerFields implements DialogFields {
|
||||
if (file != null)
|
||||
dst = file.getAbsolutePath();
|
||||
} else {
|
||||
if (Pass.passes.get(PassCode.SelectRemoteFile).Do(true))
|
||||
if ( Global.mainModule.getPass(PassCode.SelectRemoteFile).Do(true))
|
||||
dst = Global.mainModule.getRemoteFile().full_name;
|
||||
}
|
||||
if (dst != null)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package _VisualDVM.GlobalData.Machine;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Common.Visual.Controls.MenuBarButton;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Visual_DVM_2021.Passes.PassCode;
|
||||
import Common.Passes.Pass;
|
||||
import _VisualDVM.Global;
|
||||
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
@@ -20,7 +20,7 @@ public class MachinesMenuBar extends DataMenuBar {
|
||||
addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
Pass.passes.get(PassCode.UpdateProperty).Do("collapseCredentials", true);
|
||||
Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -32,13 +32,13 @@ public class ModuleAnchestorFields implements DialogFields {
|
||||
compilers.values().forEach(compiler -> cbCompilers.addItem(compiler));
|
||||
bHelp.addActionListener(e -> {
|
||||
if (cbCompilers.getSelectedItem() != null) {
|
||||
Pass.passes.get(PassCode.ShowCompilerHelp).Do(compiler, true);
|
||||
Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, true);
|
||||
} else UI_.Info("Компилятор не выбран");
|
||||
});
|
||||
BPickOptions.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
Pass<String> pass = Pass.passes.get(PassCode.PickCompilerOptions);
|
||||
Pass<String> pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
|
||||
if (pass.Do(compiler)) {
|
||||
UI_.TrySelect(cbFlags, pass.target);
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package _VisualDVM.GlobalData.Settings;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.Visual.Menus.StableMenuItem;
|
||||
import _VisualDVM.Repository.Component.ComponentType;
|
||||
import Visual_DVM_2021.Passes.PassCode;
|
||||
import Common.Passes.Pass;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Repository.Component.ComponentType;
|
||||
import _VisualDVM.Visual.Menus.StableMenuItem;
|
||||
import com.sun.org.glassfish.gmbal.Description;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -49,7 +49,7 @@ public class DBSetting extends DBObject {
|
||||
menu_item.addActionListener(new AbstractAction() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
Pass.passes.get(PassCode.UpdateSetting).Do(Name);
|
||||
Global.mainModule.getPass(PassCode.UpdateSetting).Do(Name);
|
||||
}
|
||||
});
|
||||
Mark();
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
package _VisualDVM.GlobalData.Tasks.CompilationTask;
|
||||
import _VisualDVM.Current;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.TableMenu;
|
||||
import _VisualDVM.Visual.UI;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Tables.FKBehaviour;
|
||||
import Common.Database.Tables.FKCurrentObjectBehaviuor;
|
||||
import Common.Database.Tables.FKDataBehaviour;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.TableMenu;
|
||||
import Visual_DVM_2021.Passes.PassCode;
|
||||
import Common.Passes.Pass;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
|
||||
import _VisualDVM.Visual.UI;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
@@ -60,7 +60,7 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
|
||||
public void CreateControl() {
|
||||
super.CreateControl();
|
||||
TableMenu dataTableMenu = new TableMenu(control);
|
||||
dataTableMenu.add(Pass.passes.get(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
|
||||
dataTableMenu.add( Global.mainModule.getPass(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
|
||||
control.setComponentPopupMenu(dataTableMenu);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package _VisualDVM.GlobalData.Tasks.RunTask;
|
||||
import _VisualDVM.Current;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.TableMenu;
|
||||
import _VisualDVM.Visual.UI;
|
||||
import Visual_DVM_2021.Passes.PassCode;
|
||||
import Common.Passes.Pass;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Visual.UI;
|
||||
|
||||
import static Common.Visual.Tables.TableRenderers.RendererDate;
|
||||
import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
|
||||
@@ -47,7 +47,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
|
||||
public void CreateControl() {
|
||||
super.CreateControl();
|
||||
TableMenu dataTableMenu = new TableMenu(control);
|
||||
dataTableMenu.add(Pass.passes.get(PassCode.DeleteSelectedRunTasks).createMenuItem());
|
||||
dataTableMenu.add( Global.mainModule.getPass(PassCode.DeleteSelectedRunTasks).createMenuItem());
|
||||
control.setComponentPopupMenu(dataTableMenu);
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user