no message

This commit is contained in:
2023-11-26 16:11:17 +03:00
parent 253de8526a
commit 269615abcb
15 changed files with 43 additions and 41 deletions

View File

@@ -143,7 +143,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
@Override
protected void performDone() throws Exception {
target.joinExistingVersion(version, getDescription());
target.migrateFilesSettings(target.last_version, false, false, false);
target.migrateFilesSettings(target.last_version, false, false);
}
@Override
public JMenuItem createMenuItem() {

View File

@@ -64,7 +64,7 @@ public class SPF_CreateParallelVariant extends SapforTransformation {
@Override
protected void performDone() throws Exception {
Global.transformationPermission = TransformationPermission.VariantsOnly;
target.migrateFilesSettings(target.last_version, true, false, true);
target.migrateFilesSettings(target.last_version, true, true);
if (Current.hasUI())
variant.UpdateStats(sapfor.getPredictorStats(), target.last_version.name);
}

View File

@@ -85,7 +85,7 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
int c_line = Integer.parseInt(splited[idx.Inc()]);
//-
FuncCall fc = new FuncCall(file, call_name, c_line);
fc.parent = nf;
fc.parent_offset = nf.line - fc.line;
nf.calls.add(fc);
}
}

View File

@@ -16,7 +16,7 @@ public class SPF_InlineProcedure extends SapforFilesModification {
protected boolean canStart(Object... args) throws Exception {
if (super.canStart(args) && (call = (args.length > 0) ? (FuncCall) args[0] : null) != null) {
addOpt1 = call.funcName + "|" + Current.getFile().name;
addOpt2 = String.valueOf(call.getInlineOffset());
addOpt2 = String.valueOf(call.parent_offset);
Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
// Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.PARSE_FOR_INLINE, "1");
SPF_ParseFilesWithOrder.silent = true;

View File

@@ -31,7 +31,7 @@ public class SPF_InlineProcedures extends SapforTransformation {
Result.add(String.valueOf(selected_children.size()));
for (FuncCall fc : selected_children) {
Result.add(fc.file);
Result.add(String.valueOf(fc.getInlineOffset()));
Result.add(String.valueOf(fc.parent_offset));
}
}
}

View File

@@ -1,19 +1,19 @@
package Visual_DVM_2021.Passes;
import Common.Current;
import Common.UI.UI;
import ProjectData.ProjectView;
public class SapforPass extends SilentSapforPass {
//отличается наличием журнала и сообщений
@Override
protected void performPreparation() throws Exception {
// target.CleanInterruptFile();
// target.CleanInterruptFile();
}
@Override
protected void performFinish() throws Exception {
target.db.BeginTransaction();
try {
unpackMessages();
}
catch (PassException ex){
} catch (PassException ex) {
Log.Writeln_(ex.getMessage());
}
target.db.Commit();
@@ -24,11 +24,13 @@ public class SapforPass extends SilentSapforPass {
@Override
protected void showFinish() throws Exception {
UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages();
Current.set(Current.ProjectView, ProjectView.Files);
UI.getMainWindow().getProjectWindow().ShowProjectView();
UI.getMainWindow().getProjectWindow().ShowProjectSapforLog();
}
@Override
public void Interrupt() throws Exception {
// target.CreateInterruptFile();
Current.getSapfor().Interrupt();
// target.CreateInterruptFile();
Current.getSapfor().Interrupt();
}
}

View File

@@ -55,7 +55,7 @@ public class SapforTransformation extends SapforPass {
@Override
protected void performDone() throws Exception {
//миграция типов файлов.
target.migrateFilesSettings(target.last_version, true, false, true);
target.migrateFilesSettings(target.last_version, true , true);
if (resetAnalysesAfter())
sapfor.ResetAllAnalyses();
}

View File

@@ -37,7 +37,7 @@ public class Transformation extends CurrentProjectPass {
protected void performDone() throws Exception {
//миграция типов файлов.
//это несапфоровские дела.тут копируем хедеры сами.
target.migrateFilesSettings(target.last_version, true, true, false);
target.migrateFilesSettings(target.last_version, true, false);
}
@Override
protected void performFail() throws Exception {