From a38427a25a0cbba24d0b6855b674cbace8284d0f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 25 Dec 2024 14:42:00 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D1=81=20?=
 =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=D0=BC=D0=B8.=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D0=B0=20=D0=B1=D1=8B=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=BF=D1=80=D0=B8=D0=B2=D1=8F=D0=B7=D0=BA?=
 =?UTF-8?q?=D0=B5=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B1=D0=B0=D1=80=D0=B0=20?=
 =?UTF-8?q?=D0=BA=20=D1=81=D1=82=D0=B0=D1=80=D0=BE=D0=BC=D1=83=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B0=D1=81=D0=BE=D1=80=D1=81=D1=83=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BE=D1=82=D0=BA=D1=80=D1=8B?=
 =?UTF-8?q?=D1=82=D0=B8=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2.=20v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                            | 18 +++---------------
 src/Common/Visual/DataSetControlForm.java      |  1 +
 src/Common/Visual/Menus/DataMenuBar.java       | 14 +++++++++++---
 .../ProjectData/DBArray/UI/DBArraysForm.java   |  2 +-
 .../Repository/Component/Visualiser.java       |  2 +-
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7c709eeb..b27c40a0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,24 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CredentialsWindow.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CredentialsForm.form" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CredentialsForm.java" afterDir="false" />
       <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/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.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/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/DataMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.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/CredentialsBar/CredentialsMenuBar.java" beforeDir="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" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 0cb8ac43..1f3c7373 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -62,6 +62,7 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
                     MainModule_.instance.getUI().menuBars.put(dataSource.getClass(), bar);
                 } else {
                     bar = MainModule_.instance.getUI().menuBars.get(dataSource.getClass());
+                    bar.setDataSource(dataSource);
                 }
                 mountPanel.add(bar, BorderLayout.NORTH);
                 //--
diff --git a/src/Common/Visual/Menus/DataMenuBar.java b/src/Common/Visual/Menus/DataMenuBar.java
index 674c67c8..cbd243d0 100644
--- a/src/Common/Visual/Menus/DataMenuBar.java
+++ b/src/Common/Visual/Menus/DataMenuBar.java
@@ -8,6 +8,7 @@ import java.awt.*;
 import java.awt.event.ActionListener;
 public class DataMenuBar extends VisualiserMenuBar {
     public JLabel countLabel = null;
+    private DataSet dataSource = null;
     //-
     public ActionListener selectAllListener = null;
     public ActionListener unselectAllListener = null;
@@ -19,7 +20,8 @@ public class DataMenuBar extends VisualiserMenuBar {
         add(countLabel = new JLabel("?"));
         addPasses(passes);
     }
-    public void createSelectionButtons(DataSet dataSet) {
+    public void createSelectionButtons(DataSet dataSource_in) {
+        dataSource = dataSource_in;
         java.awt.Dimension d = new Dimension(25, 25);
         if (selectAllButton == null) {
             add(selectAllButton = new MenuBarButton() {
@@ -46,10 +48,16 @@ public class DataMenuBar extends VisualiserMenuBar {
         if (selectAllListener != null) {
             selectAllButton.removeActionListener(selectAllListener);
         }
-        selectAllButton.addActionListener(selectAllListener = e -> dataSet.getUI().SelectAll(true));
+        selectAllButton.addActionListener(selectAllListener = e -> getDataSource().getUI().SelectAll(true));
         if (unselectAllListener != null) {
             unselectAllButton.removeActionListener(unselectAllListener);
         }
-        unselectAllButton.addActionListener(unselectAllListener = e -> dataSet.getUI().SelectAll(false));
+        unselectAllButton.addActionListener(unselectAllListener = e -> getDataSource().getUI().SelectAll(false));
+    }
+    public DataSet getDataSource() {
+        return dataSource;
+    }
+    public void setDataSource(DataSet dataSource) {
+        this.dataSource = dataSource;
     }
 }
diff --git a/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java b/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
index 3e17d8fb..316b07e7 100644
--- a/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
+++ b/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
@@ -51,7 +51,7 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
     public DataMenuBar createMenuBar() {
         return new DataMenuBar(dataSource.getPluralDescription()) {
             @Override
-            public void createSelectionButtons(DataSet dataSet) {
+            public void createSelectionButtons(DataSet dataSource_in) {
                 //не нужны.
             }
         };
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 1e72311c..42b83510 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -61,7 +61,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1130;
+        version = 1131;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());