From bbe99efefe384e8835774d0986a39d1a05e12109 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 11 Jan 2025 20:27:43 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  2 +-
 properties                                    |  1 +
 .../GlobalData/Settings/SettingName.java      |  3 --
 .../GlobalData/Settings/SettingsDBTable.java  |  1 -
 src/_VisualDVM/GlobalProperties.java          |  8 ++++-
 src/_VisualDVM/Passes/All/UpdateProperty.java | 29 ++++++++++++-------
 src/_VisualDVM/Passes/All/UpdateSetting.java  |  4 ---
 .../Arrays/UI/ProjectArraysForm.java          |  6 ++--
 .../CompactnessSettingsMenu.java              |  4 +--
 9 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ce2e2df2..33325a6c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,7 +14,7 @@
       <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/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/properties b/properties
index 3fd07ec8..074c8507 100644
--- a/properties
+++ b/properties
@@ -51,6 +51,7 @@
   "FortranWrapsOn": false,
   "ExtensionsOn": false,
   "ComparsionDiffMergeOn": true,
+  "ShowFullArraysDeclarations": false,
   "BugReportsAgeLimit": 4,
   "FastAccessPassesCount": 5,
   "LastOpenedProjectsCount": 25
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingName.java b/src/_VisualDVM/GlobalData/Settings/SettingName.java
index 4ce15b8c..4a2142ca 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,
     //--------------
-    ShowFullArraysDeclarations,
     ShowFullTabsNames,
     LocalMakePathWindows,
     SmallScreen,
@@ -55,8 +54,6 @@ public enum SettingName {
                 return "Путь к make.exe";
             case ShowFullTabsNames:
                 return "Показывать полные имена вкладок";
-            case ShowFullArraysDeclarations:
-                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 20b4ab25..540d54e5 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.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
         AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
         if (Utils_.isWindows())
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index a43fa01f..39f46df0 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -107,7 +107,7 @@ public class GlobalProperties {
     public int lastUserId = CommonConstants.Nan;
     @Expose
     public int lastCompilerId = CommonConstants.Nan;
-    //--
+    //-- сравнение
     @Expose
     public boolean RegisterOn = false;
     @Expose
@@ -120,6 +120,10 @@ public class GlobalProperties {
     public boolean ExtensionsOn = false;
     @Expose
     public boolean ComparsionDiffMergeOn = false;
+    //--
+    //компактность
+    @Expose
+    public boolean ShowFullArraysDeclarations =false;
     @Expose
     public int BugReportsAgeLimit = 2;
     @Expose
@@ -177,6 +181,8 @@ public class GlobalProperties {
     //-----------------
     public String getFieldDescription(String fieldName) {
         switch (fieldName) {
+            case "ShowFullArraysDeclarations":
+                return "Показывать развернутый список объявлений массивов";
             case "LastOpenedProjectsCount":
                 return "Число отображаемых последних открытых проектов";
             case "FastAccessPassesCount":
diff --git a/src/_VisualDVM/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java
index 40d12ea8..4bd6ea16 100644
--- a/src/_VisualDVM/Passes/All/UpdateProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateProperty.java
@@ -26,21 +26,14 @@ public class UpdateProperty extends Pass<Object> {
         oldValue = field.get(Global.properties);
         newValue = null;
         SliderNumberForm sliderNumberForm = new SliderNumberForm();
-        SpinnerNumberForm spinnerNumberForm = new SpinnerNumberForm() {
-            @Override
-            public void InitFields() {
-                fields.setModel(new SpinnerNumberModel(
-                        (int)oldValue,
-                        1,
-                        50,
-                        1));
-            }
-        };
-
         VDirectoryChooser directoryChooser = new VDirectoryChooser("");
         VFileChooser fileChooser = new VFileChooser("", "exe");
         //-
         if (args.length==1){
+            if (oldValue instanceof Boolean){
+                newValue=!(Boolean)oldValue;
+                return true;
+            }
             switch (name){
                 case "BugReportsAgeLimit":
                     if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
@@ -51,6 +44,16 @@ public class UpdateProperty extends Pass<Object> {
                         newValue=sliderNumberForm.Result;
                     break;
                 case "LastOpenedProjectsCount":
+                    SpinnerNumberForm spinnerNumberForm = new SpinnerNumberForm() {
+                        @Override
+                        public void InitFields() {
+                            fields.setModel(new SpinnerNumberModel(
+                                    (int)oldValue,
+                                    1,
+                                    50,
+                                    1));
+                        }
+                    };
                     if (spinnerNumberForm.ShowDialog(description, oldValue, 1, 50))
                         newValue=spinnerNumberForm.Result;
                     break;
@@ -102,6 +105,10 @@ public class UpdateProperty extends Pass<Object> {
             case "FastAccessPassesCount":
                 MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
                 break;
+            case "ShowFullArraysDeclarations":
+                if (Global.mainModule.HasProject())
+                    Global.mainModule.getProject().declaratedArrays.ShowUI();
+                break;
         }
     }
 }
diff --git a/src/_VisualDVM/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java
index be10ece9..0d01eba4 100644
--- a/src/_VisualDVM/Passes/All/UpdateSetting.java
+++ b/src/_VisualDVM/Passes/All/UpdateSetting.java
@@ -81,10 +81,6 @@ public class UpdateSetting extends Pass<DBSetting> {
                     if (Global.mainModule.HasFile())
                         Global.mainModule.getFile().form.ShowGCOV();
                     break;
-                case ShowFullArraysDeclarations:
-                    if (Global.mainModule.HasProject())
-                        Global.mainModule.getProject().declaratedArrays.ShowUI();
-                    break;
                 case ShowFullTabsNames:
                     Global.mainModule.getUI().getMainWindow().getTestingWindow().RefreshTabsNames();
                     if (Global.mainModule.HasProject())
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
index d34ec599..3b181338 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
@@ -53,15 +53,15 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
                     @Override
                     public Class getRendererClass() {
                         //todo все настройки переделать в проперти(?)
-                        return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? RendererHyperlinks.class : RendererHiddenList.class;
+                        return Global.properties.ShowFullArraysDeclarations ? RendererHyperlinks.class : RendererHiddenList.class;
                     }
                     @Override
                     public Class getEditorClass() {
-                        return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? EditorFilesHyperlinks.class : null;
+                        return Global.properties.ShowFullArraysDeclarations ? EditorFilesHyperlinks.class : null;
                     }
                     @Override
                     public int getMaxWidth() {
-                        return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? CommonConstants.Nan : 200;
+                        return  Global.properties.ShowFullArraysDeclarations ? CommonConstants.Nan : 200;
                     }
                 },
                 new ColumnInfo<ProjectArray>("Размерность") {
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
index aa9893ed..43899809 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java
@@ -6,9 +6,9 @@ public class CompactnessSettingsMenu extends SettingsSubmenu {
     public CompactnessSettingsMenu() {
         super("Компактность отображения", null,
                 SettingName.SmallScreen,
-                SettingName.ShowFullTabsNames,
-                SettingName.ShowFullArraysDeclarations
+                SettingName.ShowFullTabsNames
         );
+        add(Global.properties.getMenuItem("ShowFullArraysDeclarations"));
         add(Global.properties.getMenuItem("LastOpenedProjectsCount"));
         add(Global.properties.getMenuItem("FastAccessPassesCount"));
         addSeparator();