From 18227f565a0a8627baff6aea5e61dc234cd4de82 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 28 Mar 2025 20:01:17 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=BE=D0=B3=D0=B8=D1=87=D0=B5=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B8=D0=B9=20=D1=82=D0=B8=D0=BF=20=D0=B2=20=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                | 11 ++++-------
 .../ProjectData/Project/db_project_info.java       |  4 ++--
 .../ProjectData/SapforData/Functions/FuncCall.java |  4 ++--
 .../SapforData/Functions/FuncCallH.java            |  2 +-
 .../ProjectData/SapforData/Functions/FuncInfo.java | 14 +++++++-------
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4a5d0d7d..94791451 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Json/LoopJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.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/SapforData/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Json/LoopsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Json/LoopsJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.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/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index 60ce65f8..520b5926 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -777,8 +777,8 @@ public class db_project_info extends DBObject {
                         if (call.funcName.equals(decl1.funcName)) {
                             if (!decl1.own_calls.containsKey(call.file))
                                 decl1.own_calls.put(call.file, new Vector<>());
-                            if (decl1.needToInline) call.Select(true);
-                            call.canBeInlined = !decl1.doNotInline;
+                            if (decl1.needToInline==1) call.Select(true);
+                            call.canBeInlined = (decl1.doNotInline==1)?0:1;
                             decl1.own_calls.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 56ae49ee..b521f83b 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
@@ -14,7 +14,7 @@ public class FuncCall extends FileObjectWithMessages{
     @Expose
     public String funcName = "";  //не нужны дополнительные поля.имя функции это уже ключ.
     @Expose
-    public boolean canBeInlined = false;
+    public int canBeInlined = 0;
     @Expose
     public int parent_offset = 0;
     //---
@@ -31,7 +31,7 @@ public class FuncCall extends FileObjectWithMessages{
     }
     @Override
     public boolean isSelectionEnabled() {
-        return canBeInlined;
+        return canBeInlined!=0;
     }
     @Override
     public String getSelectionText() {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
index e38f29ce..f6c0418f 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 = true;
+        canBeInlined = 1;
         parent_offset = 0;
     }
     @Override
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java
index e3835aaa..b9b316d1 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java
@@ -18,11 +18,11 @@ public class FuncInfo extends FileObjectWithMessages {
     @Expose
     public FunctionType type;
     @Expose
-    public boolean doNotInline;
+    public int doNotInline;
     @Expose
-    public boolean doNotAnalyze;
+    public int doNotAnalyze;
     @Expose
-    public boolean needToInline;
+    public int needToInline;
     @Expose
     public FuncParam parameters;
     //вызовы функций в теле этой функции
@@ -38,9 +38,9 @@ public class FuncInfo extends FileObjectWithMessages {
         funcName = f_name;
         lineEnd = Integer.parseInt(splited[1]);
         calls_number.Set(Integer.parseInt(splited[2]));
-        needToInline = (Integer.parseInt(splited[3])) != 0;
-        doNotInline = (Integer.parseInt(splited[4])) != 0;
-        doNotAnalyze = (Integer.parseInt(splited[5])) != 0;
+        needToInline = Integer.parseInt(splited[3]);
+        doNotInline = Integer.parseInt(splited[4]);
+        doNotAnalyze = Integer.parseInt(splited[5]);
         //в си это поле isMain
         type = ((Integer.parseInt(splited[6])) != 0) ? FunctionType.Main : FunctionType.Default;
         parameters = new FuncParam();
@@ -55,7 +55,7 @@ public class FuncInfo extends FileObjectWithMessages {
     public FuncInfo(String f_name, FunctionType type_in) {
         funcName = f_name;
         type = type_in;
-        doNotInline = true;
+        doNotInline = 1;
     }
     //--
     @Override