no message

This commit is contained in:
2024-10-08 15:32:39 +03:00
parent 18ceb04325
commit e7939713e7
24 changed files with 82 additions and 155 deletions

View File

@@ -108,10 +108,6 @@ public enum Current implements CurrentAnchestor {
SapforSettings,
SapforSettingsCommand,
DVMSettings;
public static Mode mode;
public static boolean hasUI() {
return Current.mode.equals(Current.Mode.Normal);
}
public static boolean HasProject() {
return CurrentAnchestor.get(Project) != null;
}
@@ -463,14 +459,4 @@ public enum Current implements CurrentAnchestor {
return "";
}
}
//---
public enum Mode {
Undefined,
Normal,
Server,
Testing,
Package,
MachineQueue,
LocalMachineQueue
}
}

View File

@@ -26,7 +26,7 @@ public class GlobalProperties extends Properties {
}
}
@Expose
public Current.Mode Mode = Current.Mode.Normal;
public Common.Mode Mode = Common.Mode.Normal;
@Expose
public String ServerAddress = "alex-freenas.ddns.net";
@Expose
@@ -105,8 +105,6 @@ public class GlobalProperties extends Properties {
public int ComponentsBackUpsCount = 10;
//- тестирование.
@Expose
public int TestingKernels = 4; //число ядер для тестирования
@Expose
public boolean AutoCheckTesting = false; // проверять ли задачи тестирования при включенном визуализаторе.
@Expose
public int CheckTestingIntervalSeconds = 10; //интервал автопроверки тестирования
@@ -159,7 +157,6 @@ public class GlobalProperties extends Properties {
InstructionPath = p.InstructionPath;
PerformanceAnalyzerPath = p.PerformanceAnalyzerPath;
ComponentsBackUpsCount = p.ComponentsBackUpsCount;
TestingKernels = p.TestingKernels;
AutoCheckTesting = p.AutoCheckTesting;
CheckTestingIntervalSeconds = p.CheckTestingIntervalSeconds;
EmailOnTestingProgress = p.EmailOnTestingProgress;

View File

@@ -319,7 +319,7 @@ public class UI {
}
//---------------
public static boolean Question(Component parent, String text) {
return !Current.hasUI() || (JOptionPane.showConfirmDialog(parent,
return !CommonUtils.hasUI() || (JOptionPane.showConfirmDialog(parent,
text + "?",
"Подтверждение",
JOptionPane.YES_NO_OPTION,
@@ -330,16 +330,16 @@ public class UI {
}
public static void Info(String message) {
CommonUtils.CopyToClipboard(message);
if (Current.hasUI())
if (CommonUtils.hasUI())
JOptionPane.showMessageDialog(getFrontWindow(), message, "", 1);
}
public static void Error(String message) {
CommonUtils.CopyToClipboard(message);
if (Current.hasUI())
if (CommonUtils.hasUI())
JOptionPane.showMessageDialog(getFrontWindow(), message, "", 0);
}
public static boolean Warning(String text) {
return !Current.hasUI() ||
return !CommonUtils.hasUI() ||
JOptionPane.showConfirmDialog(getFrontWindow(),
text + "\nВы уверены?",
"Подтверждение",