From 269615abcbae506369c6de248dd8161c18d14c79 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 26 Nov 2023 16:11:17 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 22 +++++++++++--------
 properties                                    |  2 +-
 src/Common/Constants.java                     |  4 ++--
 src/ProjectData/Project/db_project_info.java  | 21 ++++++++----------
 .../SapforData/Functions/FuncCall.java        |  5 +----
 .../SapforData/Functions/FuncCallH.java       |  2 ++
 src/Repository/Component/Visualiser.java      |  2 +-
 .../Passes/All/DVMConvertProject.java         |  2 +-
 .../Passes/All/SPF_CreateParallelVariant.java |  2 +-
 .../Passes/All/SPF_GetGraphFunctions.java     |  2 +-
 .../Passes/All/SPF_InlineProcedure.java       |  2 +-
 .../Passes/All/SPF_InlineProcedures.java      |  2 +-
 src/Visual_DVM_2021/Passes/SapforPass.java    | 12 +++++-----
 .../Passes/SapforTransformation.java          |  2 +-
 .../Passes/Transformation.java                |  2 +-
 15 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e707a29f..8ad2cdf7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,16 +8,20 @@
   <component name="ChangeListManager">
     <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$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/Group.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforTransformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforTransformation.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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index e64c01cd..05cc0d0d 100644
--- a/properties
+++ b/properties
@@ -12,7 +12,7 @@
   "AutoUpdateSearch": true,
   "ConfirmPassesStart": true,
   "ShowPassesDone": true,
-  "FocusPassesResult": true,
+  "FocusPassesResult": false,
   "GlobalDBName": "db7.sqlite",
   "ProjectDBName": "new_project_base.sqlite",
   "BugReportsDBName": "bug_reports.sqlite",
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index 6c622f98..1cdbdbaa 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -58,8 +58,8 @@ public class Constants {
     public static final String attachments = "attachments";
     public static final String statistic = "statistic";
     public static final String unknown_metric = " — ";
-    public static final String old_tests_db_name = "tests2025";
-    public static final String tests_db_name = "tests2026";
+    public static final String old_tests_db_name = "tests2026";
+    public static final String tests_db_name = "tests2027";
     public static final String dateNaN = "NaN";
     //пробный коммит. изменение комментария.++
     //кронтаб и перезагрузка
diff --git a/src/ProjectData/Project/db_project_info.java b/src/ProjectData/Project/db_project_info.java
index 93789ea2..8950bc41 100644
--- a/src/ProjectData/Project/db_project_info.java
+++ b/src/ProjectData/Project/db_project_info.java
@@ -1014,7 +1014,7 @@ public class db_project_info extends DBObject {
         }
         return null;
     }
-    public void migrateFilesSettings(db_project_info target, boolean migrate_arrays, boolean migrate_headers, boolean sapforStyle) throws Exception {
+    public void migrateFilesSettings(db_project_info target, boolean migrate_arrays, boolean sapforStyle) throws Exception {
         Pair<LinkedHashMap<String, DBProjectFile>, LinkedHashMap<String, DBProjectFile>> sortedFiles = sortFiles();
         //--
         LinkedHashMap<String, DBProjectFile> programs = sortedFiles.getKey();
@@ -1040,16 +1040,13 @@ public class db_project_info extends DBObject {
                 version_file.importSettings(file, sapforStyle);
                 target.db.Update(version_file);
             } else {
-                if (//!file.state.equals(FileState.Excluded)&&
-                        (!file.fileType.equals(FileType.header) || migrate_headers)) {
-                    File toCopy = Paths.get(target.Home.getAbsolutePath(), file.name).toFile();
-                    if (!toCopy.exists())
-                        Files.copy(file.file.toPath(), toCopy.toPath());
-                    //--
-                    DBProjectFile new_version_file = new DBProjectFile(toCopy, target);
-                    new_version_file.importSettings(file, sapforStyle);
-                    target.db.Insert(new_version_file);
-                }
+                File toCopy = Paths.get(target.Home.getAbsolutePath(), file.name).toFile();
+                if (!toCopy.exists())
+                    Files.copy(file.file.toPath(), toCopy.toPath());
+                //--
+                DBProjectFile new_version_file = new DBProjectFile(toCopy, target);
+                new_version_file.importSettings(file, sapforStyle);
+                target.db.Insert(new_version_file);
             }
         }
         //---
@@ -1098,7 +1095,7 @@ public class db_project_info extends DBObject {
         //теперь копируем инфу по файлам.
         if (cloneData) {
             db_project_info res = new db_project_info(dst);
-            migrateFilesSettings(res, false, true, false);
+            migrateFilesSettings(res,  true, false);
         }
     }
     public void Clone(File dst) throws Exception {
diff --git a/src/ProjectData/SapforData/Functions/FuncCall.java b/src/ProjectData/SapforData/Functions/FuncCall.java
index 559c6b3e..be33d09c 100644
--- a/src/ProjectData/SapforData/Functions/FuncCall.java
+++ b/src/ProjectData/SapforData/Functions/FuncCall.java
@@ -8,7 +8,7 @@ import Visual_DVM_2021.Passes.Pass_2021;
 public class FuncCall extends FileObjectWithMessages {
     public String funcName = "";  //не нужны дополнительные поля.имя функции это уже ключ.
     public boolean canBeInlined = false;
-    public FuncInfo parent = null;
+    public int parent_offset = 0;
     public FuncCall(DBProjectFile father_in, String funcName_in, int line_in) {
         super(father_in, line_in);
         funcName = funcName_in;
@@ -35,7 +35,4 @@ public class FuncCall extends FileObjectWithMessages {
             UI.Info("Для подстановки функций требуется выполнить проход " + Utils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
         }
     }
-    public int getInlineOffset(){
-        return parent.line-line;
-    }
 }
diff --git a/src/ProjectData/SapforData/Functions/FuncCallH.java b/src/ProjectData/SapforData/Functions/FuncCallH.java
index 5e03385f..d957f77e 100644
--- a/src/ProjectData/SapforData/Functions/FuncCallH.java
+++ b/src/ProjectData/SapforData/Functions/FuncCallH.java
@@ -15,6 +15,7 @@ public class FuncCallH extends FuncCall {
         line = funcCall_in.line;
         funcName = funcCall_in.funcName;
         canBeInlined = funcCall_in.canBeInlined;
+        parent_offset = funcCall_in.parent_offset;
     }
     //особый случай. только для мейна
     //его объявление - его же и вызов.
@@ -24,6 +25,7 @@ public class FuncCallH extends FuncCall {
         line = funcInfo.line;
         funcName = funcInfo.funcName;
         canBeInlined = true;
+        parent_offset = 0;
     }
     @Override
     public String getSelectionText() {
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 7a069028..79c0f39d 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1034;
+        version = 1036;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
index ecb59215..1c91a4b5 100644
--- a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
@@ -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() {
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java b/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
index 9db94c1e..160c5181 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
@@ -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);
     }
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
index 11f2f9e5..ca1de0c6 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
@@ -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);
                     }
                 }
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java
index f8a50d6e..64eb5576 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java
@@ -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;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
index 1342b9b5..3db1e167 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
@@ -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));
                     }
                 }
             }
diff --git a/src/Visual_DVM_2021/Passes/SapforPass.java b/src/Visual_DVM_2021/Passes/SapforPass.java
index 3a670713..b2949234 100644
--- a/src/Visual_DVM_2021/Passes/SapforPass.java
+++ b/src/Visual_DVM_2021/Passes/SapforPass.java
@@ -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();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/SapforTransformation.java b/src/Visual_DVM_2021/Passes/SapforTransformation.java
index dae43425..08e21542 100644
--- a/src/Visual_DVM_2021/Passes/SapforTransformation.java
+++ b/src/Visual_DVM_2021/Passes/SapforTransformation.java
@@ -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();
     }
diff --git a/src/Visual_DVM_2021/Passes/Transformation.java b/src/Visual_DVM_2021/Passes/Transformation.java
index f8f36808..1831012a 100644
--- a/src/Visual_DVM_2021/Passes/Transformation.java
+++ b/src/Visual_DVM_2021/Passes/Transformation.java
@@ -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 {