рефакторинг сохранения форм. не было единого интерфейса

.idea/workspace.xml

@@ -7,10 +7,55 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/ApplicationMode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/Properties.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Common/Module.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/Visual/FormWithSplitters.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/Visual/SavedForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/DBForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBForm/DBForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Module.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Module.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils_.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/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Form.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Form.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Grid/TableVisualData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/Grid/TableVisualData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Grid/TablesVisualDatasDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/Grid/TablesVisualDatasDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Splitter/Splitter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/Splitter/Splitter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Splitter/SplittersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/Splitter/SplittersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/AnalysisWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/AnalysisWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ArraysWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ArraysWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CommentInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CommentInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/DescriptionInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/DescriptionInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FormWithSplitters.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FunctionsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FunctionsWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ScenariosWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ScenariosWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/VariantsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/VariantsWindow.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/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DebugForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DebugForm.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/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProfilesForm.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" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" 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" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VersionsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -109,11 +154,11 @@
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
+      <recent name="Common.MainModule_" />
       <recent name="_VisualDVM.ProjectData.Files.UI.Editor.SPFEditor" />
       <recent name="_VisualDVM.Repository.Component.Sapfor.Sapfor" />
       <recent name="Common.Visual.UI_" />
       <recent name="Common.Utils.Utils_" />
-      <recent name="Common.Visual.CommonUI" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />

src/Common/Database/Objects/DBForm/DBForm.java

@@ -12,20 +12,20 @@ public class DBForm extends DBObject {
     public int Height = 0;
     public DBForm(String type_, Window window) {
         type = type_;
-        Init(window);
+        Fill(window);
     }
     public DBForm() {
     }
-    public void Init(Window window) {
-        X = window.getX();
-        Y = window.getY();
-        Width = window.getWidth();
-        Height = window.getHeight();
-    }
     public void Apply(Window window) {
         window.setSize(Width, Height);
         window.setLocation(X, Y);
     }
+    public void Fill(Window window) {
+        X = window.getX();
+        Y = window.getY();
+        Width = window.getWidth();
+        Height = window.getHeight();
+    }
     @Override
     public Object getPK() {
         return type;

src/Common/Database/Objects/Grid/TableVisualData.java

@@ -1,4 +1,4 @@
-package _VisualDVM.GlobalData.Grid;
+package Common.Database.Objects.Grid;
 import Common.Database.Objects.DBObject;
 import com.sun.org.glassfish.gmbal.Description;
 

src/Common/Database/Objects/Grid/TablesVisualDatasDBTable.java

@@ -1,4 +1,4 @@
-package _VisualDVM.GlobalData.Grid;
+package Common.Database.Objects.Grid;
 import Common.Database.Tables.DBTable;
 public class TablesVisualDatasDBTable extends DBTable<String, TableVisualData> {
     public TablesVisualDatasDBTable() {

src/Common/Database/Objects/Splitter/Splitter.java

@@ -1,4 +1,4 @@
-package _VisualDVM.GlobalData.Splitter;
+package Common.Database.Objects.Splitter;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import com.sun.org.glassfish.gmbal.Description;

src/Common/Database/Objects/Splitter/SplittersDBTable.java

@@ -1,4 +1,4 @@
-package _VisualDVM.GlobalData.Splitter;
+package Common.Database.Objects.Splitter;
 import Common.Database.Tables.DBTable;
 import Common.Utils.Utils_;
 

src/Common/Database/VisualiserDatabase.java

@@ -1,9 +1,9 @@
 package Common.Database;
 import Common.Database.Objects.DBForm.FormsDBTable;
+import Common.Database.Objects.Grid.TablesVisualDatasDBTable;
 import Common.Database.Objects.PassStats.PassStatsDBTable;
+import Common.Database.Objects.Splitter.SplittersDBTable;
 import Common.Database.SQLITE.SQLiteDatabase;
-import _VisualDVM.GlobalData.Grid.TablesVisualDatasDBTable;
-import _VisualDVM.GlobalData.Splitter.SplittersDBTable;
 import _VisualDVM.Passes.PassCode;
 
 import java.io.File;

src/Common/MainModule_.java

@@ -137,10 +137,10 @@ public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModu
     public boolean confirmPassesStart() {
         return false;
     }
-    public boolean confirmPassesDone(){
+    public boolean confirmPassesDone() {
         return false;
     }
-    public boolean focusPassesResult(){
+    public boolean focusPassesResult() {
         return false;
     }
 }

src/Common/Module.java

@@ -1,4 +1,3 @@
 package Common;
 public class Module {
-
 }

src/Common/Passes/Pass.java

@@ -204,19 +204,18 @@ public class Pass<T> {
         Stack<Pass> ToDo = new Stack<>();
         Vector<String> ToPrint = new Vector<>();
         createStack_r(ToDo, ToPrint);
-
         if (
-                UI.isActive()&&MainModule_.instance.confirmPassesStart() && !ToPrint.isEmpty() &&
+                UI.isActive() && MainModule_.instance.confirmPassesStart() && !ToPrint.isEmpty() &&
-                !UI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
+                        !UI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
         ) return false;
         while (ToDo.size() > 1) {
             if (!ToDo.pop().start()) return false;
         }
         if (start(args)) {
-            if (UI.isActive()&&MainModule_.instance.focusPassesResult())
+            if (UI.isActive() && MainModule_.instance.focusPassesResult())
                 FocusResult();
             //-
-            if (UI.isActive()&&MainModule_.instance.confirmPassesDone() && !ToPrint.isEmpty()
+            if (UI.isActive() && MainModule_.instance.confirmPassesDone() && !ToPrint.isEmpty()
             ) {
                 UI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
                         "\nуспешно выполнен(ы)!");

src/Common/Properties.java

@@ -0,0 +1,3 @@
+package Common;
+public class Properties {
+}

src/Common/Utils/Utils_.java

@@ -66,9 +66,9 @@ public class Utils_ {
     public static void jsonToFile(Object json_object, File file) throws Exception {
         FileUtils.writeStringToFile(file, gson.toJson(json_object));
     }
-    public static JsonObject getPropertiesAsJsonObject() throws Exception{
+    public static JsonObject getPropertiesAsJsonObject() throws Exception {
         File propertiesFile = new File(System.getProperty("user.dir"), "properties");
-        if (!propertiesFile.exists()){
+        if (!propertiesFile.exists()) {
             System.out.println("Файл properties не найден!");
             return null;
         }

src/Common/Visual/DataSetControlForm.java

@@ -2,6 +2,7 @@ package Common.Visual;
 import Common.CommonConstants;
 import Common.Current_;
 import Common.Database.Objects.DBObject;
+import Common.Database.Objects.Grid.TableVisualData;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DataSet;
 import Common.Database.Tables.FKBehaviour;
@@ -14,7 +15,6 @@ import Common.Visual.Tables.DBObjectSelector;
 import Common.Visual.Tables.DataTable;
 import Common.Visual.Tables.Grid.GridAnchestor;
 import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Grid.TableVisualData;
 
 import javax.swing.*;
 import javax.swing.table.TableColumn;

src/Common/Visual/FormWithSplitters.java

@@ -0,0 +1,10 @@
+package Common.Visual;
+import Common.MainModule_;
+public interface FormWithSplitters {
+    default void LoadSplitters() {
+        MainModule_.instance.getDb().splitters.Load(this);
+    }
+    default void SaveSplitters() {
+        MainModule_.instance.getDb().splitters.Save(this);
+    }
+}

src/Common/Visual/SavedForm.java

@@ -0,0 +1,42 @@
+package Common.Visual;
+import Common.Database.Objects.DBForm.DBForm;
+import Common.MainModule_;
+
+import java.awt.*;
+public interface SavedForm {
+    default String getFormKey() {
+        return null;
+    }
+    int getDefaultWidth();
+    int getDefaultHeight();
+    default void LoadWindowParameters() {
+        if (this instanceof Window) {
+            Window window = (Window) this;
+            if ((getFormKey() != null) && MainModule_.instance.getDb().forms.Data.containsKey(getFormKey())) {
+                DBForm dbForm = MainModule_.instance.getDb().forms.Data.get(getFormKey());
+                dbForm.Apply(window);
+                return;
+            } else {
+                window.setSize(getDefaultWidth(), getDefaultHeight());
+            }
+        }
+    }
+    default void SaveWindowParameters() {
+        if ((this instanceof Window) && (getFormKey() != null)) {
+            Window window = (Window) this;
+            DBForm dbForm = null;
+            try {
+                if (MainModule_.instance.getDb().forms.containsKey(getFormKey())) {
+                    dbForm = MainModule_.instance.getDb().forms.get(getFormKey());
+                    dbForm.Fill(window);
+                    MainModule_.instance.getDb().Update(dbForm);
+                } else {
+                    dbForm = new DBForm(getFormKey(), window);
+                    MainModule_.instance.getDb().Insert(dbForm);
+                }
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+}

src/Common/Visual/Trees/StyledTree.java

@@ -24,7 +24,7 @@ public class StyledTree extends JTree implements ThemeElement {
         setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
         setToggleClickCount(0);  //отключение сворачивание разворачивания по двойному клику
         //--
-        if (getRendererClass()!=null)
+        if (getRendererClass() != null)
             setCellRenderer(MainModule_.instance.getUI().getTreeRenderer(getRendererClass()));
         //--
         getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);

src/Common/Visual/UI.java

@@ -8,7 +8,7 @@ import javax.swing.text.DefaultFormatter;
 import java.awt.*;
 public class UI {
     public static boolean isActive() {
-        return (MainModule_.instance!=null)&&MainModule_.instance.hasUI();
+        return (MainModule_.instance != null) && MainModule_.instance.hasUI();
     }
     //---
     public static void Clear(Container container) {

src/Common/Visual/UIModule_.java

@@ -13,7 +13,6 @@ import javax.swing.tree.TreeCellRenderer;
 import java.awt.*;
 import java.util.LinkedHashMap;
 import java.util.Stack;
-
 public class UIModule_ {
     public LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
     public Stack<Component> windowsStack = new Stack<>();
@@ -92,45 +91,42 @@ public class UIModule_ {
     public TableCellRenderer getTableRenderer(Class key) {
         TableCellRenderer res = null;
         if (tableRenderers.containsKey(key))
-            res= tableRenderers.get(key);
+            res = tableRenderers.get(key);
         else {
             try {
                 res = (TableCellRenderer) key.newInstance();
-            }
+            } catch (Exception ex) {
-            catch (Exception ex){
                 ex.printStackTrace();
             }
-            tableRenderers.put(key,res);
+            tableRenderers.put(key, res);
         }
         return res;
     }
     public TableCellEditor getTableEditor(Class key) {
         TableCellEditor res = null;
         if (tableEditors.containsKey(key))
-            res= tableEditors.get(key);
+            res = tableEditors.get(key);
         else {
             try {
                 res = (TableCellEditor) key.newInstance();
-            }
+            } catch (Exception ex) {
-            catch (Exception ex){
                 ex.printStackTrace();
             }
-            tableEditors.put(key,res);
+            tableEditors.put(key, res);
         }
         return res;
     }
     public TreeCellRenderer getTreeRenderer(Class key) {
         TreeCellRenderer res = null;
         if (treeRenderers.containsKey(key))
-            res= treeRenderers.get(key);
+            res = treeRenderers.get(key);
         else {
             try {
                 res = (TreeCellRenderer) key.newInstance();
-            }
+            } catch (Exception ex) {
-            catch (Exception ex){
                 ex.printStackTrace();
             }
-            treeRenderers.put(key,res);
+            treeRenderers.put(key, res);
         }
         return res;
     }

src/Common/Visual/Windows/Form.java

@@ -1,15 +1,13 @@
 package Common.Visual.Windows;
-import Common.Database.Objects.DBForm.DBForm;
 import Common.Utils.Utils_;
+import Common.Visual.SavedForm;
 import Common.Visual.Themes.ThemeElement;
-import _VisualDVM.Global;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-public abstract class Form extends JFrame implements ThemeElement {
+public abstract class Form extends JFrame implements ThemeElement, SavedForm {
-    private DBForm dbInfo = null;
     public Form() {
         if (getIconPath() != null) setIconImage(Utils_.getIcon(getIconPath()).getImage());
         SetListener();
@@ -27,9 +25,6 @@ public abstract class Form extends JFrame implements ThemeElement {
     public String getUTitleText() {
         return "";
     }
-    protected String getFormKey() {
-        return null;
-    }
     protected void SetListener() {
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
@@ -39,9 +34,11 @@ public abstract class Form extends JFrame implements ThemeElement {
             }
         });
     }
+    @Override
     public int getDefaultWidth() {
         return 800;
     }
+    @Override
     public int getDefaultHeight() {
         return 450;
     }
@@ -72,25 +69,6 @@ public abstract class Form extends JFrame implements ThemeElement {
     }
     public void AfterClose() {
     }
-    public void LoadWindowParameters() throws Exception {
-        if (getFormKey() != null)
-            if (Global.mainModule.getDb().forms.Data.containsKey(getFormKey())) {
-                dbInfo = Global.mainModule.getDb().forms.Data.get(getFormKey());
-                dbInfo.Apply(this);
-                return;
-            }
-        setSize(getDefaultWidth(), getDefaultHeight());
-        setLocationRelativeTo(getRelative());
-    }
-    public void SaveWindowParameters() throws Exception {
-        if (getFormKey() != null) {
-            if (dbInfo != null) {
-                dbInfo.Init(this);
-                Global.mainModule.getDb().Update(dbInfo);
-            } else
-                Global.mainModule.getDb().Insert(new DBForm(getFormKey(), this));
-        }
-    }
     @Override
     public void applyTheme() {
         //todo -> применение темы.

src/_VisualDVM/Global.java

@@ -15,7 +15,6 @@ import _VisualDVM.Repository.Component.Sapfor.MessagesServer;
 import _VisualDVM.Repository.Component.Sapfor.Sapfor_F;
 import _VisualDVM.Repository.Server.ComponentsServer;
 import _VisualDVM.TestingSystem.Common.TestingServer;
-import _VisualDVM.TestingSystem.DVM.LocalDVMTestingPlanner;
 import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
 import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;

src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java

@@ -36,7 +36,7 @@ public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(2).setRendererClass( CompilerOptionParameterNameRenderer.class);
+                columns.get(2).setRendererClass(CompilerOptionParameterNameRenderer.class);
                 columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class);
                 columns.get(3).setEditorClass(CompilerOptionParameterValueRenderer.class);
                 columns.get(4).setRendererClass(RendererMultiline.class);

src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java

@@ -14,7 +14,6 @@ import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
 import _VisualDVM.Passes.PassCode;
 
 import java.util.LinkedHashMap;
-
 public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
     public CompilationTasksDBTable() {
         super(CompilationTask.class);

src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java

@@ -7,7 +7,6 @@ import Common.Visual.Tables.RendererStatusEnum;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-
 public class RunTasksDBTable extends iDBTable<RunTask> {
     public RunTasksDBTable() {
         super(RunTask.class);

src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java

@@ -10,7 +10,6 @@ import _VisualDVM.Visual.Tables.EditorFilesHyperlinks;
 import _VisualDVM.Visual.Tables.RendererHyperlinks;
 
 import java.util.Vector;
-
 public class ArraysSet extends DataSet<Long, ProjectArray> {
     public ArraysSet() {
         super(Long.class, ProjectArray.class);

src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java

@@ -7,7 +7,6 @@ import _VisualDVM.Visual.Menus.GraphMenu;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
-
 public class RulesTree extends StyledTree {
     public RulesTree() {
         super(Global.mainModule.getProject().align_rules_root);

src/_VisualDVM/ProjectData/SapforData/Variants/VariantsSet.java

@@ -7,7 +7,6 @@ import Common.Visual.Tables.RendererMultiline;
 import _VisualDVM.Current;
 import _VisualDVM.ProjectData.SapforData.Variants.UI.RendererVariantRank;
 import _VisualDVM.Visual.Menus.VariantsMenuBar.VariantsMenuBar;
-
 public class VariantsSet extends DataSet<String, ParallelVariant> {
     public VariantsSet() {
         super(String.class, ParallelVariant.class);
@@ -29,7 +28,7 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
                 columns.get(2).setRendererClass(RendererMultiline.class);
                 for (int i = 3; i < columns.size() - 3; ++i)
                     columns.get(i).setRendererClass(RendererMaskedNanInteger.class);
-                columns.get(columns.size() - 3).setRendererClass( RendererVariantRank.class);
+                columns.get(columns.size() - 3).setRendererClass(RendererVariantRank.class);
                 columns.get(columns.size() - 2).setRendererClass(RendererDate.class);
             }
         };

src/_VisualDVM/Repository/Component/ComponentsSet.java

@@ -7,7 +7,6 @@ import _VisualDVM.Current;
 import _VisualDVM.Visual.Menus.ComponentsMenuBar;
 
 import java.util.Vector;
-
 public class ComponentsSet extends DataSet<ComponentType, Component> {
     public ComponentsSet() {
         super(ComponentType.class, Component.class);

src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java

@@ -13,7 +13,6 @@ import _VisualDVM.ServerObjectsCache.VisualCaches;
 
 import java.util.Comparator;
 import java.util.Date;
-
 public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     public static boolean filterMyOnly = false;
     public static boolean filterActive = false;

src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java

@@ -10,7 +10,6 @@ import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 
 import java.util.Comparator;
-
 public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
     //todo обобщить бы наличие фильтров для всех таблиц.
     DVMPackage target;

src/_VisualDVM/Visual/Interface/AnalysisWindow.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Interface;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.VisualizerForm;
 public interface AnalysisWindow extends FormWithSplitters, VisualizerForm {
     void ShowProjectMaxDim();

src/_VisualDVM/Visual/Interface/ArraysWindow.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Interface;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.VisualizerForm;
 public interface ArraysWindow extends VisualizerForm, FormWithSplitters {
     void ShowArrays();

src/_VisualDVM/Visual/Interface/CommentInterface.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Interface;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.VisualizerForm;
 
 import javax.swing.*;

src/_VisualDVM/Visual/Interface/DescriptionInterface.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Interface;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.VisualizerForm;
 
 import javax.swing.*;

src/_VisualDVM/Visual/Interface/FormWithSplitters.java

@@ -1,10 +0,0 @@
-package _VisualDVM.Visual.Interface;
-import _VisualDVM.Global;
-public interface FormWithSplitters {
-    default void LoadSplitters() {
-        Global.mainModule.getDb().splitters.Load(this);
-    }
-    default void SaveSplitters() {
-        Global.mainModule.getDb().splitters.Save(this);
-    }
-}

src/_VisualDVM/Visual/Interface/FunctionsWindow.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Interface;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.VisualizerForm;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
 import javafx.util.Pair;

src/_VisualDVM/Visual/Interface/ScenariosWindow.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Interface;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.VisualizerForm;
 public interface ScenariosWindow extends FormWithSplitters, VisualizerForm {
     void ShowAll();

src/_VisualDVM/Visual/Interface/VariantsWindow.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Interface;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.VisualizerForm;
 public interface VariantsWindow extends VisualizerForm, FormWithSplitters {
     void ShowProjectDistribution();

src/_VisualDVM/Visual/MainUI.java

@@ -27,9 +27,7 @@ public class MainUI extends UIModule_ {
     //-
     public MainUI() {
         setTheme(new LightSPFEditorTheme());
-
     }
-
     //-
     public TestingMenuBar getTestingMenuBar() {
         if (testingMenuBar == null)

src/_VisualDVM/Visual/Windows/CallbackForm.java

@@ -1,5 +1,6 @@
 package _VisualDVM.Visual.Windows;
 import Common.Utils.Utils_;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.UI;
@@ -14,7 +15,6 @@ import _VisualDVM.Visual.Editor.Viewer;
 import _VisualDVM.Visual.Interface.CallbackWindow;
 import _VisualDVM.Visual.Interface.CommentInterface;
 import _VisualDVM.Visual.Interface.DescriptionInterface;
-import _VisualDVM.Visual.Interface.FormWithSplitters;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;

src/_VisualDVM/Visual/Windows/DebugForm.java

@@ -1,7 +1,7 @@
 package _VisualDVM.Visual.Windows;
+import Common.Visual.FormWithSplitters;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.Interface.DebugWindow;
-import _VisualDVM.Visual.Interface.FormWithSplitters;
 
 import javax.swing.*;
 public class DebugForm implements DebugWindow, FormWithSplitters {

src/_VisualDVM/Visual/Windows/FileForm.java

@@ -1,5 +1,6 @@
 package _VisualDVM.Visual.Windows;
 import Common.CommonConstants;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.Trees.TreeForm;
 import Common.Visual.UI;
 import _VisualDVM.Global;
@@ -16,7 +17,6 @@ import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree;
 import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree;
 import _VisualDVM.Visual.Editor.Viewer;
 import _VisualDVM.Visual.Interface.FileWindow;
-import _VisualDVM.Visual.Interface.FormWithSplitters;
 import _VisualDVM.Visual.Interface.SPFEditorInterface;
 import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
 import com.sun.org.glassfish.gmbal.Description;

src/_VisualDVM/Visual/Windows/MainForm.java

@@ -2,12 +2,16 @@ package _VisualDVM.Visual.Windows;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.TabToolBar;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.Windows.Form;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
-import _VisualDVM.Visual.Interface.*;
+import _VisualDVM.Visual.Interface.CallbackWindow;
+import _VisualDVM.Visual.Interface.ProjectWindow;
+import _VisualDVM.Visual.Interface.TestingWindow;
+import _VisualDVM.Visual.Interface.TestsWindow;
 import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
 import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
 
@@ -42,7 +46,7 @@ public class MainForm extends Form implements MainWindow {
         return Content;
     }
     @Override
-    protected String getFormKey() {
+    public String getFormKey() {
         return "Main"; //можно было бы через имя класса
     }
     @Override

src/_VisualDVM/Visual/Windows/ProfilesFields.java

@@ -1,7 +1,7 @@
 package _VisualDVM.Visual.Windows;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.Interface.FormWithSplitters;
 
 import javax.swing.*;
 import java.awt.*;

src/_VisualDVM/Visual/Windows/ProfilesForm.java

@@ -1,9 +1,9 @@
 package _VisualDVM.Visual.Windows;
 import Common.Database.Objects.DBForm.DBForm;
+import Common.Visual.SavedForm;
 import Common.Visual.Windows.Dialog.Dialog;
 import _VisualDVM.Global;
-//todo разобраться с DBform
+public class ProfilesForm extends Dialog<Object, ProfilesFields> implements SavedForm {
-public class ProfilesForm extends Dialog<Object, ProfilesFields> {
     private DBForm info = null;
     public ProfilesForm() {
         super(ProfilesFields.class);
@@ -38,37 +38,15 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
     public void CreateContent() {
         super.CreateContent();
         fields.LoadSplitters();
-        try {
+        LoadWindowParameters();
-            LoadWindowParameters();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
     }
     @Override
     public void onClose() {
         fields.SaveSplitters();
-        try {
+        SaveWindowParameters();
-            SaveWindowParameters();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
     }
-    protected String getFormKey() {
+    @Override
+    public String getFormKey() {
         return "Profiles"; //можно было бы через имя класса
     }
-    public void LoadWindowParameters() throws Exception {
-        if ((Global.mainModule.getDb()).forms.Data.containsKey(getFormKey())) {
-            info = (Global.mainModule.getDb()).forms.Data.get(getFormKey());
-            info.Apply(this);
-            return;
-        }
-        setSize(getDefaultWidth(), getDefaultHeight());
-    }
-    public void SaveWindowParameters() throws Exception {
-        if (info != null) {
-            info.Init(this);
-            Global.mainModule.getDb().Update(info);
-        } else
-            Global.mainModule.getDb().Insert(new DBForm(getFormKey(), this));
-    }
 }

src/_VisualDVM/Visual/Windows/ProjectForm.java

@@ -2,6 +2,7 @@ package _VisualDVM.Visual.Windows;
 import Common.MainModule_;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.TabToolBar;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.Trees.TreeForm;
 import Common.Visual.UI;
 import _VisualDVM.Global;
@@ -14,7 +15,10 @@ import _VisualDVM.ProjectData.SapforData.Functions.UI.InlineTree;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.InlineTree2;
 import _VisualDVM.ProjectData.SapforData.Includes.UI.IncludesTree;
 import _VisualDVM.Visual.Editor.Viewer;
-import _VisualDVM.Visual.Interface.*;
+import _VisualDVM.Visual.Interface.AnalysisWindow;
+import _VisualDVM.Visual.Interface.ArraysWindow;
+import _VisualDVM.Visual.Interface.FunctionsWindow;
+import _VisualDVM.Visual.Interface.ProjectWindow;
 import _VisualDVM.Visual.Menus.ProjectMenuBar.ProjectMenuBar;
 
 import javax.swing.*;

src/_VisualDVM/Visual/Windows/SearchReplaceForm.java

@@ -180,7 +180,7 @@ public class SearchReplaceForm extends Form {
         lCount.setText(String.valueOf(result.getMarkedCount()));
     }
     @Override
-    protected String getFormKey() {
+    public String getFormKey() {
         return "SearchReplace";
     }
     private void createUIComponents() {

src/_VisualDVM/Visual/Windows/TestingForm.java

@@ -1,5 +1,6 @@
 package _VisualDVM.Visual.Windows;
 import Common.CommonConstants;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.UI;
 import _VisualDVM.Current;
@@ -10,7 +11,6 @@ import _VisualDVM.TestingSystem.Common.TestingServer;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import _VisualDVM.Visual.Interface.FormWithSplitters;
 import _VisualDVM.Visual.Interface.TestingWindow;
 
 import javax.swing.*;

src/_VisualDVM/Visual/Windows/TestsForm.java

@@ -1,6 +1,6 @@
 package _VisualDVM.Visual.Windows;
+import Common.Visual.FormWithSplitters;
 import _VisualDVM.Global;
-import _VisualDVM.Visual.Interface.FormWithSplitters;
 import _VisualDVM.Visual.Interface.TestsWindow;
 
 import javax.swing.*;

src/_VisualDVM/Visual/Windows/VersionsForm.java

@@ -1,10 +1,10 @@
 package _VisualDVM.Visual.Windows;
+import Common.Visual.FormWithSplitters;
 import Common.Visual.Trees.TreeForm;
 import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Project.UI.VersionsTree;
 import _VisualDVM.ProjectData.Project.db_project_info;
-import _VisualDVM.Visual.Interface.FormWithSplitters;
 import _VisualDVM.Visual.Interface.VariantsWindow;
 import _VisualDVM.Visual.Interface.VersionsWindow;