From fae3ecc8b9316002e7e53b4367fc177a50bd32c5 Mon Sep 17 00:00:00 2001 From: 02090095 Date: Tue, 15 Oct 2024 20:06:58 +0300 Subject: [PATCH] no message --- .idea/workspace.xml | 8 ++++---- src/Common/Passes/Pass.java | 6 +++--- src/_VisualDVM/Global.java | 9 --------- src/_VisualDVM/MainModule.java | 6 +++--- src/_VisualDVM/Mode.java | 3 +-- 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be8d698a..a93c4325 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,20 +7,23 @@ - + + + + @@ -78,7 +81,6 @@ - @@ -102,9 +104,7 @@ - - diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java index 0d51bb91..be900321 100644 --- a/src/Common/Passes/Pass.java +++ b/src/Common/Passes/Pass.java @@ -206,17 +206,17 @@ public class Pass { createStack_r(ToDo, ToPrint); if ( - MainModule_.instance.confirmPassesStart() && !ToPrint.isEmpty() && + UI.isActive()&&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 (MainModule_.instance.focusPassesResult()) + if (UI.isActive()&&MainModule_.instance.focusPassesResult()) FocusResult(); //- - if (MainModule_.instance.confirmPassesDone() && !ToPrint.isEmpty() + if (UI.isActive()&&MainModule_.instance.confirmPassesDone() && !ToPrint.isEmpty() ) { UI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) + "\nуспешно выполнен(ы)!"); diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java index 1ab38219..b7e36e70 100644 --- a/src/_VisualDVM/Global.java +++ b/src/_VisualDVM/Global.java @@ -317,12 +317,6 @@ public class Global { supervisor.Perform(); } } - public static void LocalMachineQueueMode(String... args) throws Exception { - LocalDVMTestingPlanner supervisor = new LocalDVMTestingPlanner(args); - while (true) { - supervisor.Perform(); - } - } //--- public static void Init(String... args) { System.out.println("VisualSapfor.jar started.."); @@ -348,9 +342,6 @@ public class Global { case MachineQueue: MachineQueueMode(args); break; - case LocalMachineQueue: - LocalMachineQueueMode(args); - break; case Undefined: break; } diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java index 2f70b2f9..07824484 100644 --- a/src/_VisualDVM/MainModule.java +++ b/src/_VisualDVM/MainModule.java @@ -336,14 +336,14 @@ public class MainModule extends MainModule_ { } @Override public boolean confirmPassesStart() { - return hasUI()&&Global.properties.ConfirmPassesStart; + return Global.properties.ConfirmPassesStart; } @Override public boolean confirmPassesDone() { - return hasUI()&&Global.properties.ShowPassesDone; + return Global.properties.ShowPassesDone; } @Override public boolean focusPassesResult() { - return hasUI()&&Global.properties.FocusPassesResult; + return Global.properties.FocusPassesResult; } } diff --git a/src/_VisualDVM/Mode.java b/src/_VisualDVM/Mode.java index f9a3840c..53e32a43 100644 --- a/src/_VisualDVM/Mode.java +++ b/src/_VisualDVM/Mode.java @@ -5,6 +5,5 @@ public enum Mode { Server, Testing, Package, - MachineQueue, - LocalMachineQueue + MachineQueue }