From debc1a6cae594963a2938d12b49a30a3ff04e380 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 17 Oct 2024 20:44:11 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 11 ++++-
 src/Common/Database/Tables/DataSet.java       | 42 +++++++++++--------
 src/Common/Visual/Tables/ColumnFilter.java    |  2 +-
 src/_VisualDVM/Passes/All/AddSubscriber.java  |  2 +-
 .../Passes/All/UpdateSelectedComponents.java  |  2 +-
 .../Passes/Server/DeleteServerObject.java     |  2 +-
 .../Passes/Server/EditServerObject.java       |  2 +-
 .../Passes/Server/PublishServerObject.java    |  2 +-
 src/_VisualDVM/Visual/Windows/FileForm.java   |  4 +-
 9 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f8f8e70e..e0fce9ed 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,16 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.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/All/UpdateSelectedComponents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.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/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/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index e8cd4865..e370b4a4 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -28,7 +28,13 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     public Class<D> d; //класс объектов.
     public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
     //-
-    public DataSetControlForm ui_;
+    protected DataSetControlForm ui= null;
+    public DataSetControlForm getUI() {
+        return ui;
+    }
+    public void setUI(DataSetControlForm ui_in) {
+        this.ui = ui_in;
+    }
     //-
     public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
     protected FilterInterface f_ui; // отображение количества объектов
@@ -51,14 +57,14 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     public void mountUI(JPanel mountPanel_in) {
         UI.Clear(mountPanel_in);
         //-->
-        ui_ = createUI(mountPanel_in);
+        setUI(createUI(mountPanel_in));
         //-->
         if (hasMenuBar()) {
             try {
                 DataMenuBar bar = null;
                 if (!MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
                     bar = createMenuBar();
-                    if (ui_.hasCheckBox())
+                    if (getUI().hasCheckBox())
                         bar.createSelectionButtons(this);
                     MainModule_.instance.getUI().menuBars.put(getClass(), bar);
                 } else {
@@ -81,30 +87,30 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         }
     }
     public DataSetControlForm getUi() {
-        return ui_;
+        return getUI();
     }
     public void setFilterUI(FilterInterface ui_in) {
         f_ui = ui_in;
     }
     public void ClearUI() {
-        if ((ui_ != null) && ui_.isShown()) {
-            ui_.ClearSelection();
-            ui_.Clear();
+        if ((getUI() != null) && getUI().isShown()) {
+            getUI().ClearSelection();
+            getUI().Clear();
             if (f_ui != null)
                 f_ui.ShowNoMatches();
         }
     }
     public void RefreshUI() {
-        if (ui_ != null) ui_.Refresh();
+        if (getUI() != null) getUI().Refresh();
     }
     public int getRowCountUI() {
-        return ui_.getRowCount();
+        return getUI().getRowCount();
     }
     public void SetCurrentObjectUI(Object pk) {
-        if (ui_ != null) {
+        if (getUI() != null) {
             //todo возможно проверить, что текущий объект уже соответствует ключу, и если да, то ничего делать.
-            ui_.ClearSelection(); //сброс текущего объекта и всего что с ним связано.
-            ui_.Select(pk);
+            getUI().ClearSelection(); //сброс текущего объекта и всего что с ним связано.
+            getUI().Select(pk);
         }
     }
     public String[] getUIColumnNames() {
@@ -114,7 +120,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         return null;
     }
     public boolean hasUI() {
-        return ui_ != null;
+        return getUI() != null;
     }
     public void SelectAll(boolean flag) {
         for (D object : Data.values()) {
@@ -231,8 +237,8 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         for (DataSetFilter<D> filter : filters)
             filter.Drop();
         //--
-        if (ui_ != null) {
-            ui_.Show();
+        if (getUI() != null) {
+            getUI().Show();
             if (f_ui != null)
                 f_ui.ShowMatchesCount(getRowCountUI());
         }
@@ -244,8 +250,8 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         for (DataSetFilter<D> filter : filters)
             filter.Drop();
         //--
-        if (ui_ != null) {
-            ui_.Show(key);
+        if (getUI() != null) {
+            getUI().Show(key);
             if (f_ui != null)
                 f_ui.ShowMatchesCount(getRowCountUI());
         }
@@ -320,7 +326,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         if (hasUI()) {
             Object lastPk = selections.get(getClass());
             if ((CurrentName() != null) && (lastPk != null)) {
-                ui_.Select(lastPk);
+                getUI().Select(lastPk);
             }
         }
     }
diff --git a/src/Common/Visual/Tables/ColumnFilter.java b/src/Common/Visual/Tables/ColumnFilter.java
index caac2954..6fd5a12d 100644
--- a/src/Common/Visual/Tables/ColumnFilter.java
+++ b/src/Common/Visual/Tables/ColumnFilter.java
@@ -19,7 +19,7 @@ public class ColumnFilter {
                 setBorder(null);
                 addActionListener(e -> {
                     popup.setVisible(false);
-                    dataSet.ui_.getControl().getTableHeader().repaint();
+                    dataSet.getUI().getControl().getTableHeader().repaint();
                 });
                 getDocument().addDocumentListener(new DocumentListener() {
                     @Override
diff --git a/src/_VisualDVM/Passes/All/AddSubscriber.java b/src/_VisualDVM/Passes/All/AddSubscriber.java
index e3e5aa6a..916f01c6 100644
--- a/src/_VisualDVM/Passes/All/AddSubscriber.java
+++ b/src/_VisualDVM/Passes/All/AddSubscriber.java
@@ -34,6 +34,6 @@ public class AddSubscriber extends ComponentsRepositoryPass<Subscriber> {
     @Override
     protected void showDone() throws Exception {
         super.showDone();
-        server.db.subscribers.ui_.Show(target.getPK());
+        server.db.subscribers.getUI().Show(target.getPK());
     }
 }
diff --git a/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java b/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java
index a6f19bc8..0b07bfa3 100644
--- a/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java
+++ b/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java
@@ -41,7 +41,7 @@ public class UpdateSelectedComponents extends Pass<Vector<Component>> {
     @Override
     protected void body() throws Exception {
         for (Component component : target) {
-            Global.Components.ui_.Select(component.getPK());
+            Global.Components.getUI().Select(component.getPK());
             Global.mainModule.getPass(PassCode.UpdateComponent).Do();
         }
     }
diff --git a/src/_VisualDVM/Passes/Server/DeleteServerObject.java b/src/_VisualDVM/Passes/Server/DeleteServerObject.java
index 8ee9f5ff..27a04c92 100644
--- a/src/_VisualDVM/Passes/Server/DeleteServerObject.java
+++ b/src/_VisualDVM/Passes/Server/DeleteServerObject.java
@@ -37,6 +37,6 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
     }
     @Override
     protected void showDone() throws Exception {
-        getDb().getTable(d).ui_.Show();
+        getDb().getTable(d).getUI().Show();
     }
 }
diff --git a/src/_VisualDVM/Passes/Server/EditServerObject.java b/src/_VisualDVM/Passes/Server/EditServerObject.java
index 022d2e10..6c8411cc 100644
--- a/src/_VisualDVM/Passes/Server/EditServerObject.java
+++ b/src/_VisualDVM/Passes/Server/EditServerObject.java
@@ -26,6 +26,6 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
     @Override
     protected void showDone() throws Exception {
         VisualCaches.RefreshCache(target);
-        getDb().getTable(d).ui_.Show(target.getPK());
+        getDb().getTable(d).getUI().Show(target.getPK());
     }
 }
diff --git a/src/_VisualDVM/Passes/Server/PublishServerObject.java b/src/_VisualDVM/Passes/Server/PublishServerObject.java
index b758a91c..0577246a 100644
--- a/src/_VisualDVM/Passes/Server/PublishServerObject.java
+++ b/src/_VisualDVM/Passes/Server/PublishServerObject.java
@@ -41,6 +41,6 @@ public class PublishServerObject<S extends RepositoryServer, D extends DBObject>
     @Override
     protected void showDone() throws Exception {
         super.showDone();
-        getDb().getTable(d).ui_.Show(pk);
+        getDb().getTable(d).getUI().Show(pk);
     }
 }
diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java
index 96cb3836..470acfc2 100644
--- a/src/_VisualDVM/Visual/Windows/FileForm.java
+++ b/src/_VisualDVM/Visual/Windows/FileForm.java
@@ -337,8 +337,8 @@ public class FileForm implements FileWindow, FormWithSplitters {
     }
     @Override
     public void ShowFirstError() {
-        if (file.father.db.errors.ui_.getRowCount() > 0)
-            file.father.db.errors.ui_.getControl().SelectRow(0);
+        if (file.father.db.errors.getUI().getRowCount() > 0)
+            file.father.db.errors.getUI().getControl().SelectRow(0);
     }
     @Override
     public void ShowCompilationOutput() {