From 34620925f365801b57bca961b7494f6233bc9964 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 7 Oct 2023 01:17:06 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=B0.=20=D0=BD=D0=B5=20=D0=B1=D1=8B=D0=BB=D0=BE=20=D1=83?=
 =?UTF-8?q?=D1=87=D1=82=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=82=D1=81=D1=83=D1=82?=
 =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=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=B2=20=D0=BA=D0=BE=D0=BD=D1=81=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                   |  4 ++++
 src/Common/Global.java                                |  1 +
 src/ProjectData/Messages/Message.java                 | 11 +++++------
 src/SapforTestingSystem/PerformSapforTask.java        |  4 ++--
 .../SapforTestingPlaner/SapforTestingPlanner.java     |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8bebfe2a..c7a90f7b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,11 @@
   </component>
   <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/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 4cc78fd7..1b34de59 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -224,6 +224,7 @@ public class Global {
         }
         return (bad_state == 0);
     }
+    //возможно заменить settings на properties
     public static DBSetting getSetting(SettingName settingName) throws Exception {
         switch (Current.mode) {
             case Normal:
diff --git a/src/ProjectData/Messages/Message.java b/src/ProjectData/Messages/Message.java
index 34be1689..7b225b48 100644
--- a/src/ProjectData/Messages/Message.java
+++ b/src/ProjectData/Messages/Message.java
@@ -24,11 +24,12 @@ public class Message extends FileObject {
         file = file_in;
         line = line_in;
         setGroup(group_in);
-        value = ((group == parser_group) ||
-                !Global.getSetting(SettingName.TRANSLATE_MESSAGES).toBoolean() ?
-                value_in : decodeRussianMessage(value_in));
+        if ((group == parser_group) || (Current.mode != Current.Mode.Normal)) {
+            value = value_in;
+        } else {
+            value = !Global.getSetting(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in);
+        }
     }
-
     // last code - 183
     private static String decodeRussianMessage(String coded) throws Exception {
         if (codedMessages == null) {
@@ -267,7 +268,6 @@ public class Message extends FileObject {
 //2018
             codedMessages.put("R191", "Приватная переменная '%s' была удалена");
             codedMessages.put("R201", "Приватная переменная '%s' была частично удалена");
-
 //2019
             codedMessages.put("R192", "Нельзя удалить приватную переменную '%s' - она не имеет фиксированных измерений");
 //2020
@@ -281,7 +281,6 @@ public class Message extends FileObject {
             codedMessages.put("R199", "Зависимость по скаляру с типом lastprivate препятствует распараллеливанию данного цикла");
             codedMessages.put("R200", "Добавлена lastprivate переменная '%s' к циклу на строке %d");
 //3002
-
 //3001
             codedMessages.put("R108", "Добавлена across-зависимость к массиву '%s' в цикле.");
 //3002
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index 4e816310..8a1e4cef 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -167,7 +167,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
         res.line = Constants.Nan;
         res.value = "";
         String line = line_in.substring(9);
-        System.out.println(line);
+        //System.out.println(line);
         int i = 0;
         int s = 0;
         String lexeme = "";
@@ -316,7 +316,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
         if (isTransformation && !messages.isEmpty()) {
             project.Open();
             project.db.BeginTransaction();
-            // System.out.println("messages size=" + messages.size());
+            System.out.println("messages size=" + messages.size());
             for (MessageError m : messages) {
                 if (project.db.files.containsKey(m.file)) {
                     DBProjectFile file = project.db.files.Data.get(m.file);
diff --git a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java b/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
index 958053eb..9664b433 100644
--- a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
+++ b/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
@@ -59,7 +59,7 @@ public class SapforTestingPlanner extends ThreadsPlanner {
             Utils.jsonToFile(results_json, new File(Global.Home, "results"));
            // System.out.println("Очистка служебных файлов");
             //тут же и строить версии.
-          //  Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep", "bat");
+            Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep", "bat","sh"); //Потом txt тоже добавить.
             FileUtils.writeStringToFile(new File(Constants.DONE), "");
         } catch (Exception e) {
             Global.Log.PrintException(e);