From 9cadbef6614c1c538bf72a200cb807a07edaee42 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 18 Sep 2025 21:13:08 +0300
Subject: [PATCH] ++

---
 .idea/workspace.xml                                  |  3 ++-
 .../Component/Json/VersionInfo_json.java             |  4 +++-
 .../ComponentsServer/Component/Sapfor/Sapfor.java    | 12 ++++--------
 src/_VisualDVM/Constants.java                        |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e28d524a..6c4cee9c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,9 @@
   <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/ComponentsServer/Component/Json/VersionInfo_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.java b/src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.java
index e5e2892d..5c67efdb 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.java
@@ -4,5 +4,7 @@ public class VersionInfo_json {
     @Expose
     public int version;
     @Expose
-    public String date;
+    public String build_date;
+    @Expose
+    public String build_time;
 }
diff --git a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
index 9f7c94f1..1d792aa6 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
@@ -4,6 +4,7 @@ import Common.Passes.PassException;
 import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
+import _VisualDVM.ComponentsServer.Component.Json.VersionInfo_json;
 import _VisualDVM.ComponentsServer.Component.OSDComponent;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
@@ -416,12 +417,9 @@ public abstract class Sapfor extends OSDComponent {
     public void GetVersionInfo() {
         try {
             RunAnalysis("SPF_GetVersionAndBuildDate", -1, "", "");
-            //заглушка.
-            version = 6666;
-            date_text = new Date().toString();
-           // VersionInfo_json versionInfo_json =
-           // UI.Info("sapfor version info");
-           // Visualizer_2.UnpackVersionInfo(this, getResult());
+            VersionInfo_json versionInfo_json = Utils_.gson.fromJson(getResult(),VersionInfo_json.class);
+            version = versionInfo_json.version;
+            date_text = versionInfo_json.build_date+" "+ versionInfo_json.build_time;
         } catch (Exception e) {
             Utils_.MainLog.PrintException(e);
             UI.Error("Не удалось получить версию компонента " + Utils_.DQuotes(getComponentType().getDescription()));
@@ -503,9 +501,7 @@ public abstract class Sapfor extends OSDComponent {
         this.predictorStats = predictorStats;
     }
     public void decodeString(String runResult) throws Exception {
-        System.out.println("String="+runResult);
         SapforResult_json resultJson = Utils_.gson.fromJson(runResult, SapforResult_json.class);
-        resultJson.Print();
         //---
         setErrorCode(resultJson.errorCode);
         setOutput(resultJson.output);
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 6882d043..daef25d3 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1257;
+    public static final int version = 1258;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--