diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 650f4aa6..8c6f9308 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,7 +11,6 @@
-
diff --git a/src/Common/MainModule_.java b/src/Common/MainModule_.java
index 3ae5aa0f..6c0dac1a 100644
--- a/src/Common/MainModule_.java
+++ b/src/Common/MainModule_.java
@@ -131,5 +131,16 @@ public abstract class MainModule_ {
next.createStack_r(ToDo, ToPrint);
}
}
- //todo обращение к пропертиес как то пофиксить
public boolean Do(Object... args) {
Stack ToDo = new Stack<>();
Vector ToPrint = new Vector<>();
createStack_r(ToDo, ToPrint);
- if (Global.properties.ConfirmPassesStart && !ToPrint.isEmpty() &&
+
+ if (
+ MainModule_.instance.confirmPassesStart() && !ToPrint.isEmpty() &&
!UI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
) return false;
while (ToDo.size() > 1) {
if (!ToDo.pop().start()) return false;
}
if (start(args)) {
- if (Global.properties.FocusPassesResult)
+ if (MainModule_.instance.focusPassesResult())
FocusResult();
//-
- if (Global.properties.ShowPassesDone && !ToPrint.isEmpty()
+ if (MainModule_.instance.confirmPassesDone() && !ToPrint.isEmpty()
) {
UI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
"\nуспешно выполнен(ы)!");
diff --git a/src/Common/Visual/Menus/FastAccessMenuBar.java b/src/Common/Visual/Menus/FastAccessMenuBar.java
index 4ce3f67b..a5eaecc3 100644
--- a/src/Common/Visual/Menus/FastAccessMenuBar.java
+++ b/src/Common/Visual/Menus/FastAccessMenuBar.java
@@ -2,7 +2,6 @@ package Common.Visual.Menus;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Visual.UI;
-import _VisualDVM.Global;
import javax.swing.*;
import java.awt.*;
diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java
index 9f0ddd4b..2f70b2f9 100644
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -1,6 +1,5 @@
package _VisualDVM;
import Common.MainModule_;
-import Common.Passes.Pass;
import Common.Utils.Vector_;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -335,4 +334,16 @@ public class MainModule extends MainModule_ {
public int getFirstAccessPassesCount() {
return getDb().settings.get(SettingName.FastAccessPassesCount).toInt32();
}
+ @Override
+ public boolean confirmPassesStart() {
+ return hasUI()&&Global.properties.ConfirmPassesStart;
+ }
+ @Override
+ public boolean confirmPassesDone() {
+ return hasUI()&&Global.properties.ShowPassesDone;
+ }
+ @Override
+ public boolean focusPassesResult() {
+ return hasUI()&&Global.properties.FocusPassesResult;
+ }
}
diff --git a/src/_VisualDVM/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java
index 2d237915..03c0a81f 100644
--- a/src/_VisualDVM/Passes/All/UpdateSetting.java
+++ b/src/_VisualDVM/Passes/All/UpdateSetting.java
@@ -5,7 +5,6 @@ import Common.Visual.Windows.Dialog.*;
import Common.Visual.Windows.Dialog.Text.TextFieldDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.DBSetting;
-import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;