M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-08 15:32:39 +03:00
parent 18ceb04325
commit e7939713e7
24 changed files with 82 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Visual_DVM_2021/Passes/All/DeleteVersion.java
View File

@@ -21,7 +21,7 @@ public class DeleteVersion extends Pass_2021<db_project_info> {
current = (Current.getVersion() != null) && Current.getVersion().Home.equals(target.Home);
return true;
} else {
if (((target = Current.getVersion()) != null) && (!Current.hasUI() ||
if (((target = Current.getVersion()) != null) && (!CommonUtils.hasUI() ||
UI.Warning("Удалить " +
((Current.HasProject() && target.Home.equals(Current.getProject().Home)) ? "текущий проект" : "версию ")
+ CommonUtils.Brackets(target.name)))) {
@@ -39,7 +39,7 @@ public class DeleteVersion extends Pass_2021<db_project_info> {
if ((Current.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath())))
passes.get(PassCode_2021.CloseCurrentProject).Do();
}
if (Current.hasUI()) {
if (CommonUtils.hasUI()) {
UI.getVersionsWindow().RemoveVersionFromComparison(target);
}
}

9
src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
View File

@@ -1,10 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common_old.Current;
import _VisualDVM.Global;
import Common.Mode;
import Common.Utils.CommonUtils;
import ProjectData.SapforData.Variants.ParallelVariant;
import Repository.Component.Sapfor.TransformationPermission;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.SapforTransformation;
import _VisualDVM.Global;
public class SPF_CreateParallelVariant extends SapforTransformation {
ParallelVariant variant = null;
@Override
@@ -65,13 +66,13 @@ public class SPF_CreateParallelVariant extends SapforTransformation {
protected void performDone() throws Exception {
Global.transformationPermission = TransformationPermission.VariantsOnly;
target.migrateFilesSettings(target.last_version, true, true);
if (Current.hasUI())
if (CommonUtils.hasUI())
variant.UpdateStats(sapfor.getPredictorStats(), target.last_version.name);
}
@Override
protected void performFinish() throws Exception {
//в пакетном режиме вариант всегда один. поэтому, сообщения надо распаковать сразу.
if (Current.mode.equals(Current.Mode.Package))
if (CommonUtils.mode.equals(Mode.Package))
super.performFinish();
}
@Override

2
src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java
View File

@@ -111,7 +111,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
protected void performPreparation() throws Exception {
super.performPreparation(); //удаление интеррупта.
//------------------------------------------------------------------------------------------>>> пакетный режим.
if (!precompilation_done && Current.hasUI()) {
if (!precompilation_done && CommonUtils.hasUI()) {
passes.get(PassCode_2021.Save).Do();
target.CleanAnalyses();
}

18
src/Visual_DVM_2021/Passes/Pass_2021.java
View File

@@ -191,30 +191,30 @@ public class Pass_2021<T> {
//-
private void PerformCanNotStart() throws Exception {
performCanNotStart();
if (Current.hasUI())
if (CommonUtils.hasUI())
showCanNotStart();
}
protected void PerformPreparation() throws Exception {
performPreparation();
if (Current.hasUI())
if (CommonUtils.hasUI())
showPreparation();
}
private void PerformFinish() throws Exception {
performFinish();
//-
if (Current.hasUI())
if (CommonUtils.hasUI())
showFinish();
}
private void PerformDone() throws Exception {
performDone();
//-
if (Current.hasUI())
if (CommonUtils.hasUI())
showDone();
}
private void PerformFail() throws Exception {
performFail();
//-
if (Current.hasUI())
if (CommonUtils.hasUI())
showFail();
}
//------
@@ -298,11 +298,11 @@ public class Pass_2021<T> {
timer.Start();
//------------------------------->
try {
if (Current.hasUI()) FocusBeforeStart();
if (CommonUtils.hasUI()) FocusBeforeStart();
if (canStart(args)) {
PerformPreparation();
//todo тут должна быть вилка на анимацию?
if (Current.hasUI() && needsAnimation()) {
if (CommonUtils.hasUI() && needsAnimation()) {
animation_sem = new Semaphore(1);
animation_sem.acquire();
//---
@@ -386,7 +386,7 @@ public class Pass_2021<T> {
" окончен за " + timer.Print() +
" состояние " + CommonUtils.Brackets(state.getDescription())
);
if (!Log.isEmpty() && Current.hasUI())
if (!Log.isEmpty() && CommonUtils.hasUI())
UI.Error(
"проход " + CommonUtils.Brackets(getDescription()) + "\n" + state.getDescription() + "\n\n" +
Log.toString());
@@ -396,7 +396,7 @@ public class Pass_2021<T> {
}
//--
public void ShowSapforMessage(String message) {
if (Current.hasUI() && form != null) {
if (CommonUtils.hasUI() && form != null) {
String[] data = message.split(":");
switch (data[0]) {
case "message_1":

3
src/Visual_DVM_2021/Passes/SapforAnalysis.java
View File

@@ -1,6 +1,5 @@
package Visual_DVM_2021.Passes;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.DebugPrintLevel;
import Common_old.UI.Menus_2023.PassControl;
@@ -49,7 +48,7 @@ public class SapforAnalysis extends SapforPass {
@Override
protected void PerformPreparation() throws Exception {
//-
if (Current.hasUI())
if (CommonUtils.hasUI())
showPreparation(); // отображение пустых данных
//-
performPreparation(); //в данном случае удаление данных