From fb53a4133a30da1f0853bd30a407b5582740e9a0 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 18 May 2024 23:31:45 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 11 ++---
 src/Repository/Component/Visualiser.java      |  2 +-
 .../SAPFOR/SapforTestingPlanner.java          |  8 ++--
 .../SAPFOR/ServerSapfor/ServerSapfor.java     |  2 +
 .../ServerSapfor/ServerSapforState.java       | 15 +++---
 .../SAPFOR/ServerSapfor/ServerSapforsBar.java |  3 +-
 .../Passes/All/ShowSapforCompilationErr.java  | 25 ++++++++++
 .../Passes/All/ShowSapforCompilationOut.java  | 25 ++++++++++
 .../Passes/All/ShowTestingServerFile.java     | 46 +++++++++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java | 13 +++++-
 10 files changed, 129 insertions(+), 21 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b2333a42..77d7574e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,16 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizeServerSapfors.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java" afterDir="false" />
       <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/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizePackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizePackages.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index c0dab4fc..a31b53c7 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 = 1099;
+        version = 1100;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
index f0285899..6d98c250 100644
--- a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -7,11 +7,8 @@ import Common.Utils.Utils;
 import ProjectData.LanguageName;
 import Repository.Component.Sapfor.Sapfor;
 import Repository.EmailMessage;
-import Repository.RepositoryRefuseException;
 import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.Common.TasksPackageState;
-import TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
 import TestingSystem.Common.TestingPlanner;
 import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
 import TestingSystem.SAPFOR.Json.SapforTest_json;
@@ -27,7 +24,6 @@ import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 import java.util.Vector;
 public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
     File workspace;
@@ -188,13 +184,16 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         }
     }
     void SyncronizeRepository() throws Exception {
+
         System.out.println("Синхронизация репозитория...");
+        UpdateSapforState(ServerSapforState.DVMRepositorySynchronization);
         System.out.println("Синхронизация ветви DVM...");
         Utils.startScript(repo, repo, "dvm_checkout",
                 "svn checkout " +
                         Constants.REPOSITORY_AUTHENTICATION +
                         " " + Constants.DVM_REPOSITORY + " 1>dvm_out.txt 2>dvm_err.txt\n").waitFor();
         System.out.println("Синхронизация ветви SAPFOR...");
+        UpdateSapforState(ServerSapforState.SAPFORRepositorySynchronization);
         Utils.startScript(repo, repo, "spf_checkout",
                 "svn checkout " +
                         Constants.REPOSITORY_AUTHENTICATION +
@@ -202,6 +201,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
     }
     void CompileSapfor() throws Exception {
         System.out.println("Сборка SAPFOR...");
+        UpdateSapforState(ServerSapforState.Compilation);
         //-
         if (repo_bin.exists())
             FileUtils.forceDelete(repo_bin);
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
index a302ebea..e9965ad6 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
@@ -1,7 +1,9 @@
 package TestingSystem.SAPFOR.ServerSapfor;
+import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.riDBObject;
 import Common.Utils.Utils;
+import GlobalData.RemoteFile.RemoteFile;
 import ProjectData.LanguageName;
 import com.sun.org.glassfish.gmbal.Description;
 
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
index 4463cec1..0f135d88 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
@@ -1,12 +1,10 @@
 package TestingSystem.SAPFOR.ServerSapfor;
-import Common.Current;
 import Common.UI.StatusEnum;
 import Common.UI.Themes.VisualiserFonts;
-
-import java.awt.*;
 public enum ServerSapforState implements StatusEnum {
     Queued,
-    RepositorySynchronization,
+    DVMRepositorySynchronization,
+    SAPFORRepositorySynchronization,
     Compilation,
     Done,
     DoneWithErrors;
@@ -20,7 +18,8 @@ public enum ServerSapforState implements StatusEnum {
             case DoneWithErrors:
                 return VisualiserFonts.BadState;
             case Compilation:
-            case RepositorySynchronization:
+            case DVMRepositorySynchronization:
+            case SAPFORRepositorySynchronization:
                 return VisualiserFonts.ProgressState;
             default:
                 return VisualiserFonts.UnknownState;
@@ -31,8 +30,10 @@ public enum ServerSapforState implements StatusEnum {
         switch (this) {
             case Queued:
                 return "в очереди";
-            case RepositorySynchronization:
-                return "синхронизация";
+            case DVMRepositorySynchronization:
+                return "синхронизация репозитория DVM";
+            case SAPFORRepositorySynchronization:
+                return "синхронизация репозитория SAPFOR";
             case Compilation:
                 return "сборка";
             case Done:
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
index 83398016..836bd7f0 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
@@ -5,7 +5,8 @@ public class ServerSapforsBar extends DataMenuBar {
     public ServerSapforsBar() {
         super("версии SAPFOR",
           PassCode_2021.CompileServerSapfor,
-          //      PassCode_2021.InstallServerSapfor,
+          PassCode_2021.ShowSapforCompilationOut,
+          PassCode_2021.ShowSapforCompilationErr,
           PassCode_2021.DeleteServerSapfor
         );
     }
diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java
new file mode 100644
index 00000000..956fe7d8
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java
@@ -0,0 +1,25 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Constants;
+import Common.Current;
+import GlobalData.RemoteFile.RemoteFile;
+public class ShowSapforCompilationErr extends ShowTestingServerFile{
+    @Override
+    protected int getTimeout() {
+        return super.getTimeout();
+    }
+    @Override
+    public String getIconPath() {
+        return "/icons/CompilationErrors.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (!Current.Check(Log,Current.ServerSapfor)){
+            return false;
+        }
+        return super.canStart("Поток ошибок", new RemoteFile(Current.getServerSapfor().home_path, Constants.err_file));
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java
new file mode 100644
index 00000000..3233beca
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java
@@ -0,0 +1,25 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Constants;
+import Common.Current;
+import GlobalData.RemoteFile.RemoteFile;
+public class ShowSapforCompilationOut extends ShowTestingServerFile{
+    @Override
+    protected int getTimeout() {
+        return super.getTimeout();
+    }
+    @Override
+    public String getIconPath() {
+        return "/icons/CompilationOutput.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (!Current.Check(Log,Current.ServerSapfor)){
+            return false;
+        }
+        return super.canStart("Поток вывода", new RemoteFile(Current.getServerSapfor().home_path, Constants.out_file));
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java b/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java
new file mode 100644
index 00000000..86705ebb
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java
@@ -0,0 +1,46 @@
+package Visual_DVM_2021.Passes.All;
+import Common.UI.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
+import Common.Utils.Utils;
+import GlobalData.RemoteFile.RemoteFile;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+import Visual_DVM_2021.Passes.PassException;
+import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.util.List;
+import java.util.Vector;
+public class ShowTestingServerFile extends TestingSystemPass<RemoteFile> {
+    String title;
+    File localFile;
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        title = (String) args[0];
+        target = (RemoteFile) args[1];
+        return true;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new ServerExchangeUnit_2021(ServerCode.ReceiveFile, target.full_name));
+        localFile = Utils.getTempFileName(target.name);
+        if (response.object != null)
+            response.Unpack(localFile);
+        else throw new PassException("Файл не найден");
+    }
+    @Override
+    protected boolean validate() {
+        return localFile.exists();
+    }
+    @Override
+    protected void showDone() throws Exception {
+        ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm();
+        List<String> lines = FileUtils.readLines(localFile);
+        Vector<String> res = new Vector<>();
+        for (int i = lines.size() - 1; i >= 0; i--)
+            res.add(lines.get(i));
+        ff.ShowDialog(title,
+                String.join("\n", res)
+        );
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index ca15f2b4..b620f8ca 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -336,12 +336,21 @@ public enum PassCode_2021 {
     SPF_InsertImplicitNone,
     CompileServerSapfor,
     ActualizeServerSapfors,
-    ;
+    ShowTestingServerFile,
+    //--
+    ShowSapforCompilationOut,
+    ShowSapforCompilationErr;
+    //--
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
-            //--
+            case ShowSapforCompilationOut:
+                return "Отобразить поток вывода сборки SAPFOR";
+            case ShowSapforCompilationErr:
+                return "Отобразить поток ошибок сборки SAPFOR";
+            case ShowTestingServerFile:
+                return "Отобразить файл сервера тестирования";
             case ActualizeServerSapfors:
                 return "Проверить собираемые версии SAPFOR";
             case CompileServerSapfor: