From ffcad7a62079665bfd5f63e0d2a220e4af6cc25e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 25 Oct 2024 13:01:54 +0300
Subject: [PATCH] Revert "no message"

This reverts commit 48d96d51d73f4eb3fbac3622827e833e6c4b977b.
---
 .idea/workspace.xml                                   | 5 ++++-
 src/Common/Database/Tables/DataSet.java               | 4 ++--
 src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e3aa1ef9..5eec5d06 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,10 @@
     </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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.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 52bc999b..3da53482 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -13,7 +13,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
     public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
     Class<K> k; //класс первичного ключа.
     //-
-    DataSetControlForm<D> ui = null;
+    DataSetControlForm ui = null;
     //--
     public DataSet(Class<K> k_in, Class<D> d_in) {
         k = k_in;
@@ -27,7 +27,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         return "";
     }
     //---
-    protected DataSetControlForm<D> createUI(JPanel mountPanel) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
         return null;
     }
     //БАЗА ДАННЫХ
diff --git a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
index 204f6514..1eaff601 100644
--- a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
+++ b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
@@ -17,7 +17,7 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
         return "сохранённые состояния";
     }
     @Override
-    protected DataSetControlForm<DBArray> createUI(JPanel mountPanel) {
+    protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DBArraysForm(this, mountPanel);
     }
 }