fix
This commit is contained in:
10
.idea/workspace.xml
generated
10
.idea/workspace.xml
generated
@@ -9,14 +9,8 @@
|
|||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/MainModule_/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/MainModule_/MainModule_.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.java" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
"InstructionPath": "",
|
"InstructionPath": "",
|
||||||
"PerformanceAnalyzerPath": "",
|
"PerformanceAnalyzerPath": "",
|
||||||
"ComponentsBackUpsCount": 10,
|
"ComponentsBackUpsCount": 10,
|
||||||
"AutoCheckTesting": true,
|
"AutoCheckTesting": false,
|
||||||
"CheckTestingIntervalSeconds": 10,
|
"CheckTestingIntervalSeconds": 10,
|
||||||
"EmailOnTestingProgress": true,
|
"EmailOnTestingProgress": true,
|
||||||
"eraseTestingWorkspaces": true
|
"eraseTestingWorkspaces": true
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ public class Pass<T> {
|
|||||||
}
|
}
|
||||||
public String getName(){return getClass().getSimpleName();}
|
public String getName(){return getClass().getSimpleName();}
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
return Global.mainModule.getPassDescription(getName());
|
return MainModule_.object.getPassDescription(getName());
|
||||||
}
|
}
|
||||||
public String getStartDescription() {
|
public String getStartDescription() {
|
||||||
return getDescription();
|
return getDescription();
|
||||||
@@ -198,7 +198,7 @@ public class Pass<T> {
|
|||||||
ToPrint.add(this.getStartDescription());
|
ToPrint.add(this.getStartDescription());
|
||||||
}
|
}
|
||||||
if (necessary() != null) {
|
if (necessary() != null) {
|
||||||
Pass next = Global.mainModule.getPass(necessary());
|
Pass next = MainModule_.object.getPass(necessary());
|
||||||
if (resetsNecessary() || !next.isDone())
|
if (resetsNecessary() || !next.isDone())
|
||||||
next.createStack_r(ToDo, ToPrint);
|
next.createStack_r(ToDo, ToPrint);
|
||||||
}
|
}
|
||||||
@@ -269,10 +269,10 @@ public class Pass<T> {
|
|||||||
animation_sem.acquire();
|
animation_sem.acquire();
|
||||||
//---
|
//---
|
||||||
form = null;
|
form = null;
|
||||||
Global.mainModule.set(Current.PassForm, null);
|
MainModule_.object.set(Current.PassForm, null);
|
||||||
System.gc();
|
System.gc();
|
||||||
//--
|
//--
|
||||||
Global.mainModule.set(Current.PassForm, form = new PassForm(this));
|
MainModule_.object.set(Current.PassForm, form = new PassForm(this));
|
||||||
dispatcher = new SwingWorker() {
|
dispatcher = new SwingWorker() {
|
||||||
@Override
|
@Override
|
||||||
protected Object doInBackground() {
|
protected Object doInBackground() {
|
||||||
|
|||||||
@@ -72,4 +72,8 @@ public class UnzipFolderPass<T> extends Pass<T> {
|
|||||||
zipFile.close();
|
zipFile.close();
|
||||||
// unpack();
|
// unpack();
|
||||||
}
|
}
|
||||||
|
@Override
|
||||||
|
public String getDescription() {
|
||||||
|
return "Распаковка папки";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,4 +69,8 @@ public class ZipFolderPass extends Pass {
|
|||||||
protected boolean validate() {
|
protected boolean validate() {
|
||||||
return new File(dst).exists();
|
return new File(dst).exists();
|
||||||
}
|
}
|
||||||
|
@Override
|
||||||
|
public String getDescription() {
|
||||||
|
return "Архивация папки";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user