From cd86f1257a8fc47970b3efc00a59c7e0fb26d025 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 13 Apr 2025 17:54:56 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                      | 7 +------
 src/_VisualDVM/ProjectData/Files/DBProjectFile.java      | 9 ++++++++-
 src/_VisualDVM/ProjectData/Project/db_project_info.java  | 2 +-
 .../ProjectData/SapforData/Functions/FuncCall.java       | 6 +++---
 .../ProjectData/SapforData/Functions/FuncCallH.java      | 2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 70676fba..4a6dee6a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,15 +8,10 @@
   <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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Инструкция по распараллеливанию в системе SAPFOR.pptx" beforeDir="false" afterPath="$PROJECT_DIR$/Инструкция по распараллеливанию в системе SAPFOR.pptx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/ProjectData/Files/DBProjectFile.java b/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
index e92f1b5d..049a8186 100644
--- a/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
+++ b/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
@@ -493,6 +493,13 @@ public class DBProjectFile extends ProjectFile {
         //--
         for (FuncInfo funcInfo: funcInfos_in){
             //--
+            funcInfo.file = this.name;
+            funcInfo.ownCalls = new LinkedHashMap<>();
+            //--
+            for (FuncCall call: funcInfo.callsFrom){
+                call.file = this.name;
+                call.parentLineOffset =  funcInfo.line - call.line;
+            }
             if (funcInfo.isMain!=0){
                 isMain = 1;
                 funcInfo.type = FunctionType.Main;
@@ -502,9 +509,9 @@ public class DBProjectFile extends ProjectFile {
                 funcInfo.type = FunctionType.Default;
             }
             //--
-            funcInfo.ownCalls = new LinkedHashMap<>();
             function_decls.put(funcInfo.funcName, funcInfo);
             call_count+=funcInfo.callsFrom.size();
+
         }
         //--
         CallGraphTitle = "Объявлений : " + function_decls.size() + "; Вызовов : " + call_count;
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index 7a8cfb89..f5eb9a1d 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -778,7 +778,7 @@ public class db_project_info extends DBObject {
                             if (!decl1.ownCalls.containsKey(call.file))
                                 decl1.ownCalls.put(call.file, new Vector<>());
                             if (decl1.needToInline==1) call.Select(true);
-                            call.canBeInlined = (decl1.doNotInline==1)?0:1;
+                            call.canBeInlined = decl1.doNotInline==0;
                             decl1.ownCalls.get(call.file).add(call);
                             node.add(new DefaultMutableTreeNode(call));
                         }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
index 0ccd2a64..c5bc0f28 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
@@ -11,9 +11,9 @@ public class FuncCall extends FileObjectWithMessages{
     //JSON------------------------------------------
     @Expose
     public String funcName = "";
-    public int canBeInlined = 0;
-    public int parentLineOffset = 0;// line объявления - line вычислять?
     //END OF JSON------------------------------------
+    public int parentLineOffset = 0;// line объявления - line вычислять?
+    public boolean canBeInlined = false;
     @Description("IGNORE")
     private boolean selected = false;
     //---
@@ -30,7 +30,7 @@ public class FuncCall extends FileObjectWithMessages{
     }
     @Override
     public boolean isSelectionEnabled() {
-        return canBeInlined!=0;
+        return canBeInlined;
     }
     @Override
     public String getSelectionText() {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
index 3f781b21..8c922c4f 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
@@ -24,7 +24,7 @@ public class FuncCallH extends FuncCall {
         file = funcInfo.file;
         line = funcInfo.line;
         funcName = funcInfo.funcName;
-        canBeInlined = 1;
+        canBeInlined = true;
         parentLineOffset = 0;
     }
     @Override