From b4180669324b903eef05f0dab7a9dfec416ec9a5 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 26 May 2025 00:23:09 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=BF=D0=B0=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B9=20=D0=BE=D1=82=20=D0=BF=D0=B0=D1=80=D1=81=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 +++---
 properties                                    |  2 +-
 src/_VisualDVM/Constants.java                 |  2 +-
 .../Passes/All/SPF_ParseFilesWithOrder.java   | 24 ++++---------------
 .../ProjectData/Project/db_project_info.java  |  1 +
 5 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dc2005d1..7807312f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,11 +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$/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/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.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/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 188d9358..5c3567d5 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests",
+  "ProjectsSearchDirectory": "E:\\BUG",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index c4afed82..2a09d483 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -58,7 +58,7 @@ public class Constants {
     public static final String package_json = "package_json";
     public static final String results_json = "results_json";
     //--
-    public static final int parser_group = -1;
+    public static final int parser_group = 6000;
     public static final int compiler_group = -2;
     //  DBProjectFile
     public static final String no_data = "Нет данных";
diff --git a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
index ae8a4fde..62dfb211 100644
--- a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
+++ b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
@@ -58,16 +58,16 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
     }
     @Override
     protected void unpackMessages() throws Exception {
-        target.updateLog(sapfor.getOutput());
+        System.out.println("packed="+sapfor.getOutputMessage());
+        for (DBProjectFile f : target.db.files.Data.values())
+            if (f.isActive()) f.state = FileState.OK;
+        super.unpackMessages();
         projLines.clear();
         goodCount = 0;
         badCount = 0;
-        for (DBProjectFile f : target.db.files.Data.values())
-            if (f.isActive()) f.state = FileState.OK;
         for (DBProjectFile f : target.db.files.Data.values()) {
-            f.ReadParseMessages();
-            f.father.db.Update(f);
             if (f.isActive()) {
+                System.out.println("file="+f.name+":"+f.state);
                 switch (f.state) {
                     case OK:
                     case HasNotes:
@@ -105,7 +105,6 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
     @Override
     protected void unpack(String packed) throws Exception {
         FilesOrderJson filesOrderJson = Utils_.gson.fromJson(packed, FilesOrderJson.class);
-        System.out.println(packed);
         for (String fileName_ :filesOrderJson.allFiles)
             target.files_order.add(Utils_.toW(fileName_));
     }
@@ -157,22 +156,9 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
         sapfor.cd(target.Home);
         Global.mainModule.getPass(PassCode.RestoreSavedArrays).Do();
         setDone();
-        /*
-        //особенность парса. журнал появляется только сейчас.
-        if (!sapfor.getOutput().isEmpty()) {
-           target.updateLog(sapfor.getOutput());
-        }
-         */
         Sapfor.transformationPermission = TransformationPermission.All;
         SPFEditor.enable_text_changed = true;
     }
-    /*
-    @Override
-    protected void showDone() throws Exception {
-        super.showDone();
-        UI.getNewMainWindow().getProjectWindow().ShowProjectSapforLog();
-    }
-     */
     @Override
     protected void performFinish() throws Exception {
         target.sapforProperties.PARSE_FOR_INLINE = false;
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index f1b6de56..026077b3 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -1149,6 +1149,7 @@ public class db_project_info extends DBObject {
             for (Message message: fileMessages.messages){
                 messageFile.AddNewMessage(message);
             }
+            messageFile.father.db.Update(messageFile);
         }
         Log = log_in;
         Update();