From 07c479ad2b63da89f85dd08ce5dbe3bf4f9ad865 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 6 Jun 2024 22:55:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B9=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                |  4 +---
 src/Repository/Component/Sapfor/Sapfor.java        |  2 +-
 src/Repository/Component/Visualiser.java           |  2 +-
 .../SAPFOR/SapforPackage/SapforPackageDBTable.java | 14 +++++++++++---
 src/Visual_DVM_2021/Passes/PassCode_2021.java      |  3 +++
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6e3b64e1..a5d20de6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,12 +7,10 @@
   </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/SPF_RenameIncludes.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_InsertImplicitNone.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_RenameIncludes.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" 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/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.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/Sapfor/Sapfor.java b/src/Repository/Component/Sapfor/Sapfor.java
index cd893818..8c795447 100644
--- a/src/Repository/Component/Sapfor/Sapfor.java
+++ b/src/Repository/Component/Sapfor/Sapfor.java
@@ -381,7 +381,7 @@ public abstract class Sapfor extends OSDComponent {
         res.add(PassCode_2021.SPF_RemoveOmpDirectives);//+
         res.add(PassCode_2021.SPF_RemoveComments);//+
         res.add(PassCode_2021.SPF_RemoveDeadCode);//+
-
+        res.add(PassCode_2021.SPF_RenameIncludes);
         res.add(PassCode_2021.SPF_InsertIncludesPass);//+
         //--
         res.add(PassCode_2021.SPF_LoopEndDoConverterPass); //+
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 0cc7807c..a57dadbe 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 = 1104;
+        version = 1105;
         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/SapforPackage/SapforPackageDBTable.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index 82b66abb..26b3fa96 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -3,7 +3,10 @@ import Common.Current;
 import Common.Database.iDBTable;
 import Common.UI.DataSetControlForm;
 
+import javax.security.auth.login.CredentialNotFoundException;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.Vector;
 
 import static Common.UI.Tables.TableRenderers.*;
 public class SapforPackageDBTable extends iDBTable<SapforPackage> {
@@ -34,8 +37,9 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
             protected void AdditionalInitColumns() {
                 //   columns.get(0).setVisible(false);
                 columns.get(4).setVisible(false);
-                columns.get(5).setVisible(false);
-               // columns.get(4).setMaxWidth(200);
+               // columns.get(5).setVisible(false);
+                columns.get(5).setRenderer(RendererMultiline);
+                columns.get(4).setMaxWidth(200);
                 columns.get(8).setRenderer(RendererProgress);
                 columns.get(9).setRenderer(RendererDate);
                 columns.get(10).setRenderer(RendererDate);
@@ -58,6 +62,10 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
                 "Статус"
         };
     }
+    public static Vector<String> getConfigurationsNames(SapforPackage object){
+        String[] data = object.configurationsNames.split(";");
+        return new Vector<String>(Arrays.asList(data));
+    }
     @Override
     public Object getFieldAt(SapforPackage object, int columnIndex) {
         switch (columnIndex) {
@@ -68,7 +76,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
             case 4:
                 return object.testsNames;
             case 5:
-                return object.configurationsNames;
+                return getConfigurationsNames(object);//object.configurationsNames;
             case 6:
                 return object.tasksCount;
             case 7:
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index fd0d2826..f8955217 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -926,6 +926,9 @@ public enum PassCode_2021 {
             case SPF_CorrectCodeStylePass: //+
                 name = "CORRECT_CODE_STYLE";
                 break;
+            case SPF_RenameIncludes:
+                name = "RENAME_INLCUDES";
+                break;
             //--
             case SPF_RemoveDvmDirectives: //+
                 name = "REMOVE_DVM_DIRS";