From c160a20d067e187ce2d3fa2ef996d7a47342b914 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 22 Oct 2024 20:16:57 +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=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D1=81=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 23 ++++---
 src/_VisualDVM/Global.java                    | 64 ++++---------------
 src/_VisualDVM/Passes/All/AddBugReport.java   |  4 +-
 .../All/GetComponentsActualVersions.java      |  8 +--
 .../All/InstallComponentFromFolder.java       |  2 +-
 .../Passes/All/PublishComponent.java          |  2 +-
 .../Passes/All/ResurrectComponent.java        |  2 +-
 .../All/ResurrectComponentFromServer.java     |  2 +-
 .../Passes/All/ShowInstruction.java           |  2 +-
 .../Passes/All/UpdateComponent.java           |  2 +-
 .../Passes/All/UpdateSelectedComponents.java  |  8 +--
 .../Repository/BugReport/BugReport.java       |  2 +-
 .../Repository/Component/ComponentsSet.java   | 45 +++++++++++++
 .../Component/UI/ComponentsFields.java        |  2 +-
 src/_VisualDVM/Visual/MainUI.java             |  2 +-
 .../Visual/Menus/MainMenuBar/MainMenuBar.java | 11 ++--
 .../Windows}/ComponentsWindow.java            |  5 +-
 17 files changed, 98 insertions(+), 88 deletions(-)
 rename src/_VisualDVM/{Repository/Component/UI => Visual/Windows}/ComponentsWindow.java (89%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a024455f..06c17f27 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,20 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectsPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectsPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddSubscriber.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowInstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowInstruction.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComponentsWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index bcbd3aac..aa34b265 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -1,5 +1,4 @@
 package _VisualDVM;
-import Common.Database.Tables.DataSet;
 import Common.Utils.Loggable;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
@@ -34,7 +33,7 @@ public class Global {
     public static boolean files_multiselection = false;
     public static boolean versions_multiselection = false;
     //??
-    public static DataSet<ComponentType, Component> Components = null;
+    public static ComponentsSet components = null;
     public static MessagesServer messagesServer = null;
     public static File ComponentsDirectory;
     public static File DataDirectory;
@@ -60,9 +59,6 @@ public class Global {
     //------------------------------------------------------------------
     public static ComponentsServer componentsServer = new ComponentsServer();
     public static TestingServer testingServer = new TestingServer();
-    public static int bad_state = 0;
-    public static int need_update = 0;
-    public static int need_publish = 0;
     public static void SynschronizeProperties() {
         try {
             File new_propertiesFile = new File(Utils_.getHomeDirectory(), "properties");
@@ -163,41 +159,7 @@ public class Global {
         }
         System.exit(0);
     }
-    //todo запихнуть в ComponentsSet
-    public static void RefreshUpdatesStatus() {
-        if (Components.getUI() != null)
-            Components.getUI().Refresh();
-        ValidateComponentsStates();
-        if (mainModule.getUI().hasMainWindow())
-            mainModule.getUI().getMainWindow().ShowUpdatesIcon();
-    }
-    public static boolean ValidateComponentsStates() {
-        bad_state = need_update = need_publish = 0;
-        for (Component component : Components.Data.values()) {
-            //    if (component.isVisible()) {
-            switch (component.getState()) {
-                case Not_found:
-                case Unknown_version:
-                case Old_version:
-                    if (component.isNecessary())
-                        bad_state++;
-                    component.Select(true);
-                    break;
-                case Needs_update:
-                    need_update++;
-                    component.Select(true);
-                    break;
-                case Needs_publish:
-                    need_publish++;
-                    break;
-                default:
-                    component.Select(false);
-                    break;
-            }
-            //    }
-        }
-        return (bad_state == 0);
-    }
+
     public static void changeSetting(SettingName settingName, Object new_value) throws Exception {
         Global.mainModule.getPass(PassCode.UpdateSetting).Do(settingName, new_value);
     }
@@ -235,15 +197,15 @@ public class Global {
         }
         messagesServer = new MessagesServer();
         messagesServer.Start();
-        Components = new ComponentsSet();
+        components = new ComponentsSet();
         mainModule.set(Current.ProjectView, ProjectView.Files);
-        Components.put(ComponentType.Visualiser, visualiser = new Visualiser());
-        Components.put(ComponentType.Sapfor_F, (Component) mainModule.set(Current.Sapfor, new Sapfor_F()));
-        Components.put(ComponentType.Visualizer_2, visualizer_2);
-        Components.put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer());
-        Components.put(ComponentType.Instruction, new Instruction());
+        components.put(ComponentType.Visualiser, visualiser = new Visualiser());
+        components.put(ComponentType.Sapfor_F, (Component) mainModule.set(Current.Sapfor, new Sapfor_F()));
+        components.put(ComponentType.Visualizer_2, visualizer_2);
+        components.put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer());
+        components.put(ComponentType.Instruction, new Instruction());
         //-
-        for (Component component : Components.Data.values())
+        for (Component component : components.Data.values())
             // if (component.isVisible())
             component.InitialVersionCheck();
         //-
@@ -255,13 +217,13 @@ public class Global {
         //-------->>
         if (properties.AutoUpdateSearch)
             Global.mainModule.getPass(PassCode.GetComponentsActualVersions).Do();
-        ValidateComponentsStates();
-        if ((need_update > 0) || (bad_state > 0)) {
+        components.validateStates();
+        if (components.needWindow()) {
             boolean flag = true;
             do {
                 Global.mainModule.getUI().getComponentsWindow().ShowDialog("");
-                if (flag = (!ValidateComponentsStates())) {
-                    if (!UI.Question("Найдено " + bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" +
+                if (flag = (!components.validateStates())) {
+                    if (!UI.Question("Найдено " + components.bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" +
                             "Вернуться к окну компонент"
                     )) {
                         UI.Info("Визуализатор завершает работу.");
diff --git a/src/_VisualDVM/Passes/All/AddBugReport.java b/src/_VisualDVM/Passes/All/AddBugReport.java
index 7d32f2e8..9b7f940b 100644
--- a/src/_VisualDVM/Passes/All/AddBugReport.java
+++ b/src/_VisualDVM/Passes/All/AddBugReport.java
@@ -44,7 +44,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
                 target.sender_address = Global.mainModule.getAccount().email;
                 target.project_version = "";
                 target.visualiser_version = Global.visualiser.version;
-                target.sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version;
+                target.sapfor_version = Global.components.get(ComponentType.Sapfor_F).version;
                 target.sapfor_settings = (Global.mainModule.getDb()).settings.getSapforSettingsText();
                 target.percentage = 0;
                 target.description = "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'";
@@ -72,7 +72,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
             logs.add(Utils_.MainLog.getLogFile());
             logs.add(Paths.get(Global.ComponentsDirectory.getAbsolutePath(), "Sapfor_log.txt").toFile());
             logs.add(Paths.get(Global.ComponentsDirectory.getAbsolutePath(), "Server_log.txt").toFile());
-            logs.add(Global.Components.get(ComponentType.Visualizer_2).getLogFile());
+            logs.add(Global.components.get(ComponentType.Visualizer_2).getLogFile());
             for (File file : logs) {
                 if (file.exists())
                     Files.copy(file.toPath(), Paths.get(attachementsDir.getAbsolutePath(), file.getName()), StandardCopyOption.REPLACE_EXISTING);
diff --git a/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java
index 0cd7248f..0cbd723c 100644
--- a/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java
+++ b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java
@@ -20,21 +20,21 @@ public class GetComponentsActualVersions extends ComponentsRepositoryPass {
     @Override
     protected void ServerAction() throws Exception {
         Vector<String> versions = new Vector<>();
-        for (Component component : Global.Components.Data.values())
+        for (Component component : Global.components.Data.values())
             //if (component.isVisible())
             versions.add(component.getComponentType().toString());
         Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsVersions, String.join("\n", versions)));
         LinkedHashMap<ComponentType, String> response_actual_versions = (LinkedHashMap<ComponentType, String>) response.object;
         for (ComponentType componentType : response_actual_versions.keySet()) {
-            Global.Components.get(componentType).unpackActualVersion(response_actual_versions.get(componentType));
+            Global.components.get(componentType).unpackActualVersion(response_actual_versions.get(componentType));
         }
         //-- получить актуальные версии с сервера.
         Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsMinimalVersions, String.join("\n", versions)));
         LinkedHashMap<ComponentType, String> response_minimal_versions = (LinkedHashMap<ComponentType, String>) response.object;
         for (ComponentType componentType : response_minimal_versions.keySet()) {
-            Global.Components.get(componentType).unpackMinimalVersion(response_minimal_versions.get(componentType));
+            Global.components.get(componentType).unpackMinimalVersion(response_minimal_versions.get(componentType));
         }
-        for (Component component : Global.Components.Data.values()) {
+        for (Component component : Global.components.Data.values()) {
             if (component.CanBeUpdated())
                 component.CheckIfNeedsUpdateOrPublish();
         }
diff --git a/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java b/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java
index 985246f0..b61a4369 100644
--- a/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java
+++ b/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java
@@ -48,6 +48,6 @@ public class InstallComponentFromFolder extends CurrentComponentPass {
     }
     @Override
     protected void showDone() throws Exception {
-        Global.RefreshUpdatesStatus();
+        Global.components.RefreshUpdatesStatus();
     }
 }
diff --git a/src/_VisualDVM/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java
index 5d18860d..dceea501 100644
--- a/src/_VisualDVM/Passes/All/PublishComponent.java
+++ b/src/_VisualDVM/Passes/All/PublishComponent.java
@@ -120,7 +120,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
     }
     @Override
     protected void showDone() throws Exception {
-        Global.RefreshUpdatesStatus();
+        Global.components.RefreshUpdatesStatus();
     }
 }
 
diff --git a/src/_VisualDVM/Passes/All/ResurrectComponent.java b/src/_VisualDVM/Passes/All/ResurrectComponent.java
index 139255f3..caf8dbe4 100644
--- a/src/_VisualDVM/Passes/All/ResurrectComponent.java
+++ b/src/_VisualDVM/Passes/All/ResurrectComponent.java
@@ -58,6 +58,6 @@ public class ResurrectComponent extends CurrentComponentPass {
     }
     @Override
     protected void showDone() throws Exception {
-        Global.RefreshUpdatesStatus();
+        Global.components.RefreshUpdatesStatus();
     }
 }
diff --git a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
index 13d8207d..f8a757ff 100644
--- a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
+++ b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
@@ -116,6 +116,6 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
     }
     @Override
     protected void showDone() throws Exception {
-        Global.RefreshUpdatesStatus();
+        Global.components.RefreshUpdatesStatus();
     }
 }
diff --git a/src/_VisualDVM/Passes/All/ShowInstruction.java b/src/_VisualDVM/Passes/All/ShowInstruction.java
index 9522332a..3005ef21 100644
--- a/src/_VisualDVM/Passes/All/ShowInstruction.java
+++ b/src/_VisualDVM/Passes/All/ShowInstruction.java
@@ -16,7 +16,7 @@ public class ShowInstruction extends Pass<File> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        target = Global.Components.get(ComponentType.Instruction).getFile();
+        target = Global.components.get(ComponentType.Instruction).getFile();
         if (!target.exists()) {
             Log.Writeln("файл инструкции:\n" + target.getAbsolutePath() + "\nне найден! Обновите компонент 'Инструкция'");
             return false;
diff --git a/src/_VisualDVM/Passes/All/UpdateComponent.java b/src/_VisualDVM/Passes/All/UpdateComponent.java
index 59f8b472..460d7dae 100644
--- a/src/_VisualDVM/Passes/All/UpdateComponent.java
+++ b/src/_VisualDVM/Passes/All/UpdateComponent.java
@@ -43,6 +43,6 @@ public class UpdateComponent extends Pass<Component> {
     }
     @Override
     protected void showDone() throws Exception {
-        Global.RefreshUpdatesStatus();
+        Global.components.RefreshUpdatesStatus();
     }
 }
diff --git a/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java b/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java
index 68ccdf24..0d697275 100644
--- a/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java
+++ b/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java
@@ -22,18 +22,18 @@ public class UpdateSelectedComponents extends Pass<Vector<Component>> {
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
         //------------------------
-        if (Global.Components.getUI().getSelectedCount() == 0) {
+        if (Global.components.getUI().getSelectedCount() == 0) {
             Log.Writeln_("Не отмечено ни одного компонента!");
             return false;
         }
-        target = Global.Components.getUI().getSelectedItems();
+        target = Global.components.getUI().getSelectedItems();
         return true;
     }
     @Override
     public String getStartDescription() {
         Vector<String> question = new Vector<>();
         question.add("Обновить компоненты");
-        for (Component component : Global.Components.getUI().getSelectedItems()) {
+        for (Component component : Global.components.getUI().getSelectedItems()) {
             question.add(component.getComponentType().getDescription());
         }
         return String.join("\n", question);
@@ -41,7 +41,7 @@ public class UpdateSelectedComponents extends Pass<Vector<Component>> {
     @Override
     protected void body() throws Exception {
         for (Component component : target) {
-            Global.Components.getUI().SetCurrentByPK(component.getPK());
+            Global.components.getUI().SetCurrentByPK(component.getPK());
             Global.mainModule.getPass(PassCode.UpdateComponent).Do();
         }
     }
diff --git a/src/_VisualDVM/Repository/BugReport/BugReport.java b/src/_VisualDVM/Repository/BugReport/BugReport.java
index f2d014f2..89ca9f37 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReport.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReport.java
@@ -44,7 +44,7 @@ public class BugReport extends rDBObject {
         sender_address = sender_address_in;
         project_version = version_in;
         visualiser_version = Global.visualiser.version;
-        sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version;
+        sapfor_version = Global.components.get(ComponentType.Sapfor_F).version;
         sapfor_settings = (Global.mainModule.getDb()).settings.getSapforSettingsText();
         percentage = 0;
         description = description_in;
diff --git a/src/_VisualDVM/Repository/Component/ComponentsSet.java b/src/_VisualDVM/Repository/Component/ComponentsSet.java
index db014c43..fda7c402 100644
--- a/src/_VisualDVM/Repository/Component/ComponentsSet.java
+++ b/src/_VisualDVM/Repository/Component/ComponentsSet.java
@@ -1,10 +1,21 @@
 package _VisualDVM.Repository.Component;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
+import _VisualDVM.Global;
 import _VisualDVM.Repository.Component.UI.ComponentsForm;
 
 import javax.swing.*;
 public class ComponentsSet extends DataSet<ComponentType, Component> {
+    public boolean bad_state = false;
+    public boolean need_update = false;
+    public boolean need_publish = false;
+    public boolean needWindow() {
+        return bad_state || need_update;
+    }
+    public String getButtonIconPath() {
+        return needWindow() ? "/icons/ComponentsNeedUpdate.gif"
+                : (need_publish ? "/icons/ComponentsNeedPublish_2023.gif" : "/icons/ComponentsActual.png");
+    }
     public ComponentsSet() {
         super(ComponentType.class, Component.class);
     }
@@ -20,4 +31,38 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new ComponentsForm(this, mountPanel);
     }
+    //--
+    public void RefreshUpdatesStatus() {
+        if (getUI() != null)
+            getUI().Refresh();
+        validateStates();
+        if (Global.mainModule.getUI().hasMainWindow())
+            Global.mainModule.getUI().getMainWindow().ShowUpdatesIcon();
+    }
+    public boolean validateStates() {
+        bad_state = need_update = need_publish = false;
+        for (Component component : Data.values()) {
+            switch (component.getState()) {
+                case Not_found:
+                case Unknown_version:
+                case Old_version:
+                    if (component.isNecessary())
+                        bad_state = true;
+                    component.Select(true);
+                    break;
+                case Needs_update:
+                    need_update = true;
+                    component.Select(true);
+                    break;
+                case Needs_publish:
+                    need_publish = true;
+                    break;
+                default:
+                    component.Select(false);
+                    break;
+            }
+            //    }
+        }
+        return !bad_state;
+    }
 }
diff --git a/src/_VisualDVM/Repository/Component/UI/ComponentsFields.java b/src/_VisualDVM/Repository/Component/UI/ComponentsFields.java
index 5bc38adb..e9d99445 100644
--- a/src/_VisualDVM/Repository/Component/UI/ComponentsFields.java
+++ b/src/_VisualDVM/Repository/Component/UI/ComponentsFields.java
@@ -8,7 +8,7 @@ public class ComponentsFields implements DialogFields {
     public JPanel content;
     private JPanel componentsPanel;
     public ComponentsFields() {
-        Global.Components.mountUI(componentsPanel);
+        Global.components.mountUI(componentsPanel);
     }
     @Override
     public Component getContent() {
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index a2c5d357..9073e4de 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -2,7 +2,7 @@ package _VisualDVM.Visual;
 import Common.Visual.UIModule_;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileChooser;
-import _VisualDVM.Repository.Component.UI.ComponentsWindow;
+import _VisualDVM.Visual.Windows.ComponentsWindow;
 import _VisualDVM.TestingSystem.Common.TestingMenuBar;
 import _VisualDVM.Visual.Interface.DebugWindow;
 import _VisualDVM.Visual.Interface.VersionsWindow;
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
index 2d57e9e1..1bf1ad80 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
@@ -13,7 +13,7 @@ import java.awt.*;
 public class MainMenuBar extends VisualiserMenuBar {
     JMenu analyses;
     JMenu transformations;
-    MenuBarButton components;
+    MenuBarButton componentsButton;
     public MainMenuBar() {
         addMenus(new LastOpenedProjectsMenu());
         addPasses(PassCode.OpenCurrentProject, PassCode.CreateEmptyProject);
@@ -23,7 +23,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 new GlobalCleaningMenu(),
                 new VisualiserSettingsMenu()
         );
-        add(components = new MenuBarButton() {
+        add(componentsButton = new MenuBarButton() {
             {
                 setToolTipText("Компоненты");
                 setIcon("/icons/ComponentsActual.png");
@@ -32,7 +32,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                         UI.Info("Перед работой с компонентами закройте анализатор производительности!");
                     } else {
                         Global.mainModule.getPass(PassCode.GetComponentsActualVersions).Do();
-                        Global.RefreshUpdatesStatus();
+                        Global.components.RefreshUpdatesStatus();
                         Global.mainModule.getUI().getComponentsWindow().ShowDialog("");
                     }
                 });
@@ -65,10 +65,7 @@ public class MainMenuBar extends VisualiserMenuBar {
         ShowProject(false);
     }
     public void ShowUpdatesIcon() {
-        components.setIcon(
-                (Global.need_update > 0) || (Global.bad_state > 0)
-                        ? "/icons/ComponentsNeedUpdate.gif"
-                        : (Global.need_publish > 0 ? "/icons/ComponentsNeedPublish_2023.gif" : "/icons/ComponentsActual.png"));
+        componentsButton.setIcon(Global.components.getButtonIconPath());
     }
     public void ShowProject(boolean flag) {
         analyses.setEnabled(flag);
diff --git a/src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java b/src/_VisualDVM/Visual/Windows/ComponentsWindow.java
similarity index 89%
rename from src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java
rename to src/_VisualDVM/Visual/Windows/ComponentsWindow.java
index 2ab3968a..a854c6a2 100644
--- a/src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java
+++ b/src/_VisualDVM/Visual/Windows/ComponentsWindow.java
@@ -1,6 +1,7 @@
-package _VisualDVM.Repository.Component.UI;
+package _VisualDVM.Visual.Windows;
 import Common.Visual.Windows.Dialog.Dialog;
 import _VisualDVM.Global;
+import _VisualDVM.Repository.Component.UI.ComponentsFields;
 
 import java.awt.*;
 public class ComponentsWindow extends Dialog<Object, ComponentsFields> {
@@ -24,7 +25,7 @@ public class ComponentsWindow extends Dialog<Object, ComponentsFields> {
     }
     @Override
     public void Init(Object... params) {
-        Global.Components.ShowUI();
+        Global.components.ShowUI();
     }
     @Override
     public void LoadSize() {