From fe752d2073b3ecf891cf117bc6ad565b43383cc7 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 11 Jan 2025 21:08:48 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  4 +--
 properties                                    |  1 +
 .../GlobalData/Settings/SettingName.java      |  3 --
 .../GlobalData/Settings/SettingsDBTable.java  |  1 -
 src/_VisualDVM/GlobalProperties.java          |  4 +++
 src/_VisualDVM/Passes/All/UpdateProperty.java |  7 +++++
 src/_VisualDVM/Passes/All/UpdateSetting.java  |  8 +----
 .../CompactnessSettingsMenu.java              |  4 +--
 src/_VisualDVM/Visual/Windows/FileForm.java   | 30 ++++++++-----------
 .../Visual/Windows/ProjectForm.java           |  2 +-
 10 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 33325a6c..efc7ed8e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,14 @@
   <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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 074c8507..cf8ee84d 100644
--- a/properties
+++ b/properties
@@ -52,6 +52,7 @@
   "ExtensionsOn": false,
   "ComparsionDiffMergeOn": true,
   "ShowFullArraysDeclarations": false,
+  "ShowFullTabsNames": true,
   "BugReportsAgeLimit": 4,
   "FastAccessPassesCount": 5,
   "LastOpenedProjectsCount": 25
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingName.java b/src/_VisualDVM/GlobalData/Settings/SettingName.java
index 4a2142ca..6b6b592c 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingName.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingName.java
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
 public enum SettingName {
     Undefined,
     //--------------
-    ShowFullTabsNames,
     LocalMakePathWindows,
     SmallScreen,
     Precompilation,
@@ -52,8 +51,6 @@ public enum SettingName {
                 return "Маленький экран";
             case LocalMakePathWindows:
                 return "Путь к make.exe";
-            case ShowFullTabsNames:
-                return "Показывать полные имена вкладок";
             case STATIC_SHADOW_ANALYSIS:
                 return "Оптимизация теневых обменов";
             case STATIC_PRIVATE_ANALYSIS:
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
index 540d54e5..d8a16beb 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
@@ -30,7 +30,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
     public void AddAll() throws Exception {
         //проверка списка всех настроек.
         //<editor-fold desc="Global">
-        AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
         if (Utils_.isWindows())
             AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index 39f46df0..a36ef5bd 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -125,6 +125,8 @@ public class GlobalProperties {
     @Expose
     public boolean ShowFullArraysDeclarations =false;
     @Expose
+    public boolean ShowFullTabsNames=true;
+    @Expose
     public int BugReportsAgeLimit = 2;
     @Expose
     public int FastAccessPassesCount=10;
@@ -181,6 +183,8 @@ public class GlobalProperties {
     //-----------------
     public String getFieldDescription(String fieldName) {
         switch (fieldName) {
+            case "ShowFullTabsNames":
+                return "Показывать полные имена вкладок";
             case "ShowFullArraysDeclarations":
                 return "Показывать развернутый список объявлений массивов";
             case "LastOpenedProjectsCount":
diff --git a/src/_VisualDVM/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java
index 4bd6ea16..5f235a6c 100644
--- a/src/_VisualDVM/Passes/All/UpdateProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateProperty.java
@@ -109,6 +109,13 @@ public class UpdateProperty extends Pass<Object> {
                 if (Global.mainModule.HasProject())
                     Global.mainModule.getProject().declaratedArrays.ShowUI();
                 break;
+            case "ShowFullTabsNames":
+                Global.mainModule.getUI().getMainWindow().getTestingWindow().RefreshTabsNames();
+                if (Global.mainModule.HasProject())
+                    Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshTabsNames();
+                if (Global.mainModule.HasFile())
+                    Global.mainModule.getFile().form.RefreshTabsNames();
+                break;
         }
     }
 }
diff --git a/src/_VisualDVM/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java
index 0d01eba4..4d13657c 100644
--- a/src/_VisualDVM/Passes/All/UpdateSetting.java
+++ b/src/_VisualDVM/Passes/All/UpdateSetting.java
@@ -81,13 +81,7 @@ public class UpdateSetting extends Pass<DBSetting> {
                     if (Global.mainModule.HasFile())
                         Global.mainModule.getFile().form.ShowGCOV();
                     break;
-                case ShowFullTabsNames:
-                    Global.mainModule.getUI().getMainWindow().getTestingWindow().RefreshTabsNames();
-                    if (Global.mainModule.HasProject())
-                        Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshTabsNames();
-                    if (Global.mainModule.HasFile())
-                        Global.mainModule.getFile().form.RefreshTabsNames();
-                    break;
+
                 case MPI_PROGRAM:
                     Global.mainModule.getPass(PassCode.CleanAnalyses).Do();
                     ((SPF_GetArrayDistributionOnlyAnalysis)
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
index 43899809..826cf7cd 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
@@ -5,10 +5,10 @@ import _VisualDVM.Visual.Menus.SettingsSubmenu;
 public class CompactnessSettingsMenu extends SettingsSubmenu {
     public CompactnessSettingsMenu() {
         super("Компактность отображения", null,
-                SettingName.SmallScreen,
-                SettingName.ShowFullTabsNames
+                SettingName.SmallScreen
         );
         add(Global.properties.getMenuItem("ShowFullArraysDeclarations"));
+        add(Global.properties.getMenuItem("ShowFullTabsNames"));
         add(Global.properties.getMenuItem("LastOpenedProjectsCount"));
         add(Global.properties.getMenuItem("FastAccessPassesCount"));
         addSeparator();
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index 372533db..182e3f18 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -169,38 +169,33 @@ public class FileForm implements FileWindow, FormWithSplitters {
     //----
     @Override
     public void ShowWarningsCount() {
-        boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
-        messagesTabs.setTitleAt(1, (flag ? "Предупреждения: " : "") + file.father.db.warnings.getUI().getRowCount());
+        messagesTabs.setTitleAt(1, (Global.properties.ShowFullTabsNames ? "Предупреждения: " : "") + file.father.db.warnings.getUI().getRowCount());
     }
     @Override
     public void ShowErrorsCount() {
-        boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
-        messagesTabs.setTitleAt(2, (flag ? "Ошибки: " : "") + file.father.db.errors.getUI().getRowCount());
+        messagesTabs.setTitleAt(2, (Global.properties.ShowFullTabsNames  ? "Ошибки: " : "") + file.father.db.errors.getUI().getRowCount());
     }
     @Override
     public void ShowNotesCount() {
-        boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
-        messagesTabs.setTitleAt(0, (flag ? "Примечания: " : "") + file.father.db.notes.getUI().getRowCount());
+        messagesTabs.setTitleAt(0, (Global.properties.ShowFullTabsNames  ? "Примечания: " : "") + file.father.db.notes.getUI().getRowCount());
     }
     @Override
     public void ShowRecommendationsCount() {
-        boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
-        messagesTabs.setTitleAt(3, (flag ? "Рекомендации: " : "") + file.father.db.recommendations.getUI().getRowCount());
+        messagesTabs.setTitleAt(3, (Global.properties.ShowFullTabsNames  ? "Рекомендации: " : "") + file.father.db.recommendations.getUI().getRowCount());
     }
     //---
     @Override
     public void RefreshTabsNames() {
-        boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
-        UI.ShowTabsNames(graphsTabs, flag);
+        UI.ShowTabsNames(graphsTabs, Global.properties.ShowFullTabsNames );
         //--
         ShowNotesCount();
         ShowWarningsCount();
         ShowErrorsCount();
         ShowRecommendationsCount();
         //--
-        messagesTabs.setTitleAt(4, (flag ? "Компиляция" : ""));
-        messagesTabs.setTitleAt(5, (flag ? "Запуск" : ""));
-        messagesTabs.setTitleAt(6, (flag ? "Журнал GCOV" : ""));
+        messagesTabs.setTitleAt(4, (Global.properties.ShowFullTabsNames  ? "Компиляция" : ""));
+        messagesTabs.setTitleAt(5, (Global.properties.ShowFullTabsNames  ? "Запуск" : ""));
+        messagesTabs.setTitleAt(6, (Global.properties.ShowFullTabsNames  ? "Журнал GCOV" : ""));
     }
     @Override
     public void FocusCompilationOut() {
@@ -231,15 +226,14 @@ public class FileForm implements FileWindow, FormWithSplitters {
     }
     @Override
     public void ShowNoMessages() {
-        boolean full_tiles = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
         file.father.db.notes.ClearUI();
         file.father.db.warnings.ClearUI();
         file.father.db.errors.ClearUI();
         file.father.db.recommendations.ClearUI();
-        messagesTabs.setTitleAt(0, (full_tiles ? "Примечания: " : "") + "-");
-        messagesTabs.setTitleAt(1, (full_tiles ? "Предупреждения: " : "") + "-");
-        messagesTabs.setTitleAt(2, (full_tiles ? "Ошибки: " : "") + "-");
-        messagesTabs.setTitleAt(3, (full_tiles ? "Рекомендации: " : "") + "-");
+        messagesTabs.setTitleAt(0, (Global.properties.ShowFullTabsNames  ? "Примечания: " : "") + "-");
+        messagesTabs.setTitleAt(1, (Global.properties.ShowFullTabsNames  ? "Предупреждения: " : "") + "-");
+        messagesTabs.setTitleAt(2, (Global.properties.ShowFullTabsNames  ? "Ошибки: " : "") + "-");
+        messagesTabs.setTitleAt(3, (Global.properties.ShowFullTabsNames  ? "Рекомендации: " : "") + "-");
     }
     @Override
     public void ShowLoops() {
diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java
index b1c20afb..9436d41a 100644
--- a/src/_VisualDVM/Visual/Windows/ProjectForm.java
+++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java
@@ -226,7 +226,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
     }
     @Override
     public void RefreshTabsNames() {
-        UI.ShowTabsNames(projectTabs, 1, Global.mainModule.getDb().settings.get(SettingName.ShowFullTabsNames).toBoolean());
+        UI.ShowTabsNames(projectTabs, 1, Global.properties.ShowFullTabsNames);
     }
     @Override
     public void RefreshProjectTreeAndMessages() {