diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0dd0f81e..7756d69c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,14 +9,8 @@
-
-
-
-
-
-
-
-
+
+
diff --git a/properties b/properties
index 3b795484..b348b777 100644
--- a/properties
+++ b/properties
@@ -33,7 +33,7 @@
"InstructionPath": "",
"PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10,
- "AutoCheckTesting": true,
+ "AutoCheckTesting": false,
"CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": true,
"eraseTestingWorkspaces": true
diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index 7610eacc..7dc40aa7 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -110,7 +110,7 @@ public class Pass {
}
public String getName(){return getClass().getSimpleName();}
public String getDescription() {
- return Global.mainModule.getPassDescription(getName());
+ return MainModule_.object.getPassDescription(getName());
}
public String getStartDescription() {
return getDescription();
@@ -198,7 +198,7 @@ public class Pass {
ToPrint.add(this.getStartDescription());
}
if (necessary() != null) {
- Pass next = Global.mainModule.getPass(necessary());
+ Pass next = MainModule_.object.getPass(necessary());
if (resetsNecessary() || !next.isDone())
next.createStack_r(ToDo, ToPrint);
}
@@ -269,10 +269,10 @@ public class Pass {
animation_sem.acquire();
//---
form = null;
- Global.mainModule.set(Current.PassForm, null);
+ MainModule_.object.set(Current.PassForm, null);
System.gc();
//--
- Global.mainModule.set(Current.PassForm, form = new PassForm(this));
+ MainModule_.object.set(Current.PassForm, form = new PassForm(this));
dispatcher = new SwingWorker() {
@Override
protected Object doInBackground() {
diff --git a/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java b/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java
index ec8e2633..73d52ef9 100644
--- a/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java
+++ b/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java
@@ -72,4 +72,8 @@ public class UnzipFolderPass extends Pass {
zipFile.close();
// unpack();
}
+ @Override
+ public String getDescription() {
+ return "Распаковка папки";
+ }
}
diff --git a/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java b/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java
index 740171e6..438ee7b6 100644
--- a/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java
+++ b/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java
@@ -69,4 +69,8 @@ public class ZipFolderPass extends Pass {
protected boolean validate() {
return new File(dst).exists();
}
+ @Override
+ public String getDescription() {
+ return "Архивация папки";
+ }
}