From 264fc3b955d90b3df1607c1dad9fe7201dc3a505 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 16 May 2024 21:56:34 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=88=D1=80=D0=B8=D1=84=D1=82=D0=B0=20?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=B0=20=D0=B2=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 16 ++++++-----
 src/Common/UI/StatusEnum.java                 |  4 +--
 src/Common/UI/Tables/StatusEnumRenderer.java  |  4 ++-
 src/GlobalData/Tasks/TaskState.java           | 14 +++++-----
 src/GlobalData/User/UserState.java            |  4 +--
 src/Repository/BugReport/BugReportState.java  |  6 ++---
 src/Repository/Component/ComponentState.java  | 10 +++----
 .../Common/TasksPackageState.java             |  8 +++---
 .../SAPFOR/SapforTask/ComparisonState.java    |  8 +++---
 .../ServerSapfor/ServerSapforState.java       | 27 ++++++++++++++++---
 .../ServerSapfor/ServerSapforsDBTable.java    |  2 +-
 11 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 36b0fe42..f45a6d45 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,12 +8,16 @@
   <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/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" 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/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.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/Visual_DVM_2021/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/StatusEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/StatusEnum.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Tables/StatusEnumRenderer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.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/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/StatusEnum.java b/src/Common/UI/StatusEnum.java
index e6085209..4a680f57 100644
--- a/src/Common/UI/StatusEnum.java
+++ b/src/Common/UI/StatusEnum.java
@@ -4,10 +4,8 @@ import Common.UI.Themes.VisualiserFonts;
 
 import java.awt.*;
 public interface StatusEnum {
-    default Font getFont() {
-        return Current.getTheme().Fonts.get(VisualiserFonts.UnknownState);
-    }
     default String getDescription() {
         return toString();
     }
+    default VisualiserFonts getFont() {return VisualiserFonts.UnknownState;}
 }
diff --git a/src/Common/UI/Tables/StatusEnumRenderer.java b/src/Common/UI/Tables/StatusEnumRenderer.java
index f7ff213b..ecc9b3b5 100644
--- a/src/Common/UI/Tables/StatusEnumRenderer.java
+++ b/src/Common/UI/Tables/StatusEnumRenderer.java
@@ -1,7 +1,9 @@
 package Common.UI.Tables;
+import Common.Current;
 import Common.UI.StatusEnum;
 
 import javax.swing.*;
+import java.util.Currency;
 public class StatusEnumRenderer extends RendererCell<StatusEnum> {
     @Override
     public StatusEnum Init(JTable table, Object value, int row, int column) {
@@ -11,7 +13,7 @@ public class StatusEnumRenderer extends RendererCell<StatusEnum> {
     public void Display() {
         if (value != null) {
             setText(value.getDescription());
-            setFont(value.getFont());
+            setFont(Current.getTheme().Fonts.get(value.getFont()));
         }
     }
 }
diff --git a/src/GlobalData/Tasks/TaskState.java b/src/GlobalData/Tasks/TaskState.java
index e6950601..b1e098c7 100644
--- a/src/GlobalData/Tasks/TaskState.java
+++ b/src/GlobalData/Tasks/TaskState.java
@@ -92,7 +92,7 @@ public enum TaskState implements StatusEnum {
         }
     }
     @Override
-    public Font getFont() {
+    public VisualiserFonts getFont() {
         switch (this) {
             case FailedToQueue:
             case NoSuchTask:
@@ -102,18 +102,18 @@ public enum TaskState implements StatusEnum {
             case WrongTestFormat:
             case InternalError:
             case Canceled:
-                return Current.getTheme().Fonts.get(VisualiserFonts.BadState);
+                return VisualiserFonts.BadState;
             case Queued:
             case Running:
-                return Current.getTheme().Fonts.get(VisualiserFonts.ProgressState);
+                return VisualiserFonts.ProgressState;
             case Done:
-                return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
+                return VisualiserFonts.GoodState;
             case Crushed:
-                return Current.getTheme().Fonts.get(VisualiserFonts.Fatal);
+                return VisualiserFonts.Fatal;
             case Finished:
-                return Current.getTheme().Fonts.get(VisualiserFonts.BlueState);
+                return VisualiserFonts.BlueState;
             case WorkspaceReady:
-                return Current.getTheme().Fonts.get(VisualiserFonts.ReadyState);
+                return VisualiserFonts.ReadyState;
             default:
                 return StatusEnum.super.getFont();
         }
diff --git a/src/GlobalData/User/UserState.java b/src/GlobalData/User/UserState.java
index 082d80fb..3c51cc0f 100644
--- a/src/GlobalData/User/UserState.java
+++ b/src/GlobalData/User/UserState.java
@@ -9,8 +9,8 @@ public enum UserState implements StatusEnum {
     ready,   //рудимент.
     ready_to_work;//пользователь готов к работе,все установлено.
     @Override
-    public Font getFont() {
-        return this == UserState.ready_to_work ? Current.getTheme().Fonts.get(VisualiserFonts.GoodState) : StatusEnum.super.getFont();
+    public VisualiserFonts getFont() {
+        return this == UserState.ready_to_work ? VisualiserFonts.GoodState : StatusEnum.super.getFont();
     }
     @Override
     public String getDescription() {
diff --git a/src/Repository/BugReport/BugReportState.java b/src/Repository/BugReport/BugReportState.java
index 9e78bb36..22608e0b 100644
--- a/src/Repository/BugReport/BugReportState.java
+++ b/src/Repository/BugReport/BugReportState.java
@@ -10,12 +10,12 @@ public enum BugReportState implements Serializable, StatusEnum {
     closed,
     draft;
     @Override
-    public Font getFont() {
+    public VisualiserFonts getFont() {
         switch (this) {
             case active:
-                return Current.getTheme().Fonts.get(VisualiserFonts.BadState);
+                return VisualiserFonts.BadState;
             case closed:
-                return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
+                return VisualiserFonts.GoodState;
             default:
                 return StatusEnum.super.getFont();
         }
diff --git a/src/Repository/Component/ComponentState.java b/src/Repository/Component/ComponentState.java
index 78a01256..61986c14 100644
--- a/src/Repository/Component/ComponentState.java
+++ b/src/Repository/Component/ComponentState.java
@@ -13,18 +13,18 @@ public enum ComponentState implements StatusEnum {
     Needs_publish,
     Unknown_version;
     @Override
-    public Font getFont() {
+    public VisualiserFonts getFont() {
         switch (this) {
             case Actual:
-                return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
+                return VisualiserFonts.GoodState;
             case Not_found:
             case Unknown_version:
             case Old_version:
-                return Current.getTheme().Fonts.get(VisualiserFonts.BadState);
+                return VisualiserFonts.BadState;
             case Needs_update:
-                return Current.getTheme().Fonts.get(VisualiserFonts.ProgressState);
+                return VisualiserFonts.ProgressState;
             case Needs_publish:
-                return Current.getTheme().Fonts.get(VisualiserFonts.BlueState);
+                return VisualiserFonts.BlueState;
             default:
                 return StatusEnum.super.getFont();
         }
diff --git a/src/TestingSystem/Common/TasksPackageState.java b/src/TestingSystem/Common/TasksPackageState.java
index f8efc70c..7f213ac8 100644
--- a/src/TestingSystem/Common/TasksPackageState.java
+++ b/src/TestingSystem/Common/TasksPackageState.java
@@ -43,17 +43,17 @@ public enum TasksPackageState implements StatusEnum {
         }
     }
     @Override
-    public Font getFont() {
+    public VisualiserFonts getFont() {
         switch (this) {
             case TestsSynchronize:
             case Analysis:
             case Draft:
-                return Current.getTheme().Fonts.get(VisualiserFonts.BlueState);
+                return VisualiserFonts.BlueState;
             case CompilationExecution:
             case RunningExecution:
-                return Current.getTheme().Fonts.get(VisualiserFonts.ProgressState);
+                return VisualiserFonts.ProgressState;
             case Done:
-                return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
+                return VisualiserFonts.GoodState;
             default:
                 return StatusEnum.super.getFont();
         }
diff --git a/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java b/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
index 4613d2e6..d7830724 100644
--- a/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
@@ -21,14 +21,14 @@ public enum ComparisonState implements StatusEnum {
         }
     }
     @Override
-    public Font getFont() {
+    public VisualiserFonts getFont() {
         switch (this) {
             case Unknown:
-                return Current.getTheme().Fonts.get(VisualiserFonts.UnknownState);
+                return VisualiserFonts.UnknownState;
             case Match:
-                return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
+                return VisualiserFonts.GoodState;
             case NotMatch:
-                return Current.getTheme().Fonts.get(VisualiserFonts.BadState);
+                return VisualiserFonts.BadState;
             default:
                 return StatusEnum.super.getFont();
         }
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
index 40057a43..72716a39 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
@@ -1,5 +1,9 @@
 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,
@@ -7,20 +11,37 @@ public enum ServerSapforState implements StatusEnum {
     Done,
     DoneWithErrors;
     @Override
+    public VisualiserFonts getFont() {
+        switch (this){
+            case Queued:
+                return VisualiserFonts.UnknownState;
+            case Done:
+                return VisualiserFonts.GoodState;
+            case DoneWithErrors:
+                return VisualiserFonts.BadState;
+            case Compilation:
+            case RepositorySynchronization:
+                return VisualiserFonts.ProgressState;
+            default:
+                return VisualiserFonts.UnknownState;
+        }
+    }
+    @Override
     public String getDescription() {
         switch (this) {
             case Queued:
                 return "в очереди";
             case RepositorySynchronization:
-                return "синхронизация репозитория";
+                return "синхронизация";
             case Compilation:
                 return "сборка";
             case Done:
-                return "сборка успешно";
+                return "успешно";
             case DoneWithErrors:
-                return "сборка с ошибками";
+                return "с ошибками";
             default:
                 return StatusEnum.super.getDescription();
         }
     }
+
 }
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index c3304497..55c02dd0 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -22,7 +22,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
     }
     @Override
     public String[] getUIColumnNames() {
-        return new String[]{"версия", "дата сборки", "статус"};
+        return new String[]{"версия", "дата сборки", "сборка"};
     }
     @Override
     public Object getFieldAt(ServerSapfor object, int columnIndex) {