From b309745e35f4fd19e0d7dae44a9f98549ff4f654 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 26 Oct 2023 20:05:36 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |   8 +-
 src/Common/UI/UI.java                         |   9 +-
 src/Common/UI/Windows/FormType.java           |   2 +-
 .../Passes/All/ShowSapforTaskPackage.java     |   2 +-
 .../UI/Main/SapforPackageFields.form          | 121 ++++++++++++++++++
 .../UI/Main/SapforPackageFields.java          |  22 ++++
 .../UI/Main/SapforPackageForm.form            |  11 --
 .../UI/Main/SapforPackageForm.java            |  80 +++++++++++-
 8 files changed, 230 insertions(+), 25 deletions(-)
 create mode 100644 src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
 create mode 100644 src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
 delete mode 100644 src/Visual_DVM_2021/UI/Main/SapforPackageForm.form

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f7d84d70..dbe06f61 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.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/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/FormType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Windows/FormType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 42b3660f..33f0f394 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -82,10 +82,7 @@ import TestingSystem.Test.TestDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.UI.Interface.DebugWindow;
 import Visual_DVM_2021.UI.Interface.VersionsWindow;
-import Visual_DVM_2021.UI.Main.DebugForm;
-import Visual_DVM_2021.UI.Main.MainForm;
-import Visual_DVM_2021.UI.Main.ProfilesForm;
-import Visual_DVM_2021.UI.Main.VersionsForm;
+import Visual_DVM_2021.UI.Main.*;
 
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
@@ -257,6 +254,7 @@ public class UI {
         windows.put(FormType.SearchReplace, new SearchReplaceForm());
         windows.put(FormType.RemoteFileChooser, new RemoteFileChooser());
         windows.put(FormType.Profiles, new ProfilesForm());
+        windows.put(FormType.SapforPackage, new SapforPackageForm());
         windows.put(FormType.Main, new MainForm());
         //---------------------------------------
         getMainWindow().Show();
@@ -367,6 +365,9 @@ public class UI {
     public static ProfilesForm getProfilesWindow() {
         return (ProfilesForm) windows.get(FormType.Profiles);
     }
+    public static SapforPackageForm getSapforPackageWindow() {
+        return (SapforPackageForm) windows.get(FormType.SapforPackage);
+    }
     public static Component getFrontWindow() {
         Component res = null;
         try {
diff --git a/src/Common/UI/Windows/FormType.java b/src/Common/UI/Windows/FormType.java
index a8654411..2f614f15 100644
--- a/src/Common/UI/Windows/FormType.java
+++ b/src/Common/UI/Windows/FormType.java
@@ -6,5 +6,5 @@ public enum FormType {
     SearchReplace,
     Components,
     RemoteFileChooser,
-    Profiles
+    SapforPackage, Profiles
 }
diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
index 25c4f713..373dc589 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
@@ -22,6 +22,6 @@ public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
     }
     @Override
     protected void body() throws Exception {
-        UI.Info("+");
+        UI.getSapforPackageWindow().ShowDialog("Отображение пакета задач SAPFOR", target);
     }
 }
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
new file mode 100644
index 00000000..43212fcd
--- /dev/null
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Visual_DVM_2021.UI.Main.SapforPackageFields">
+  <grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
+    <constraints>
+      <xy x="20" y="20" width="500" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <splitpane id="67d95" binding="SCY">
+        <constraints border-constraint="Center"/>
+        <properties>
+          <dividerLocation value="250"/>
+          <dividerSize value="3"/>
+          <orientation value="0"/>
+        </properties>
+        <border type="none"/>
+        <children>
+          <grid id="dd84a" layout-manager="BorderLayout" hgap="0" vgap="0">
+            <constraints>
+              <splitpane position="left"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <toolbar id="f0668" binding="tools">
+                <constraints border-constraint="North"/>
+                <properties>
+                  <floatable value="false"/>
+                  <maximumSize width="32929" height="30"/>
+                </properties>
+                <border type="none"/>
+                <children>
+                  <component id="d7cbc" class="javax.swing.JLabel" binding="lObjectName">
+                    <constraints/>
+                    <properties>
+                      <font name="Times New Roman" size="16" style="1"/>
+                      <foreground color="-16777216"/>
+                      <text value="? "/>
+                    </properties>
+                  </component>
+                  <component id="3b87b" class="javax.swing.JButton" binding="bApplyObject">
+                    <constraints/>
+                    <properties>
+                      <borderPainted value="false"/>
+                      <icon value="icons/Apply.png"/>
+                      <maximumSize width="30" height="30"/>
+                      <minimumSize width="30" height="30"/>
+                      <preferredSize width="30" height="30"/>
+                      <text value=""/>
+                      <toolTipText value="Назначить объект для сравнения"/>
+                    </properties>
+                  </component>
+                  <component id="5cdc4" class="javax.swing.JButton" binding="bClose">
+                    <constraints/>
+                    <properties>
+                      <borderPainted value="false"/>
+                      <icon value="icons/Close.png"/>
+                      <maximumSize width="30" height="30"/>
+                      <minimumSize width="30" height="30"/>
+                      <preferredSize width="30" height="30"/>
+                      <text value=""/>
+                      <toolTipText value="Открепить объект"/>
+                    </properties>
+                  </component>
+                  <component id="e2e53" class="javax.swing.JSeparator">
+                    <constraints/>
+                    <properties/>
+                  </component>
+                  <component id="b6737" class="javax.swing.JButton" binding="bPrevious">
+                    <constraints/>
+                    <properties>
+                      <borderPainted value="false"/>
+                      <icon value="icons/Prev.png"/>
+                      <maximumSize width="30" height="30"/>
+                      <minimumSize width="30" height="30"/>
+                      <preferredSize width="30" height="30"/>
+                      <text value=""/>
+                      <toolTipText value="Перейти к предыдущему различию "/>
+                    </properties>
+                  </component>
+                  <component id="6d986" class="javax.swing.JButton" binding="bNext">
+                    <constraints/>
+                    <properties>
+                      <borderPainted value="false"/>
+                      <icon value="icons/Next.png"/>
+                      <maximumSize width="30" height="30"/>
+                      <minimumSize width="30" height="30"/>
+                      <preferredSize width="30" height="30"/>
+                      <text value=""/>
+                      <toolTipText value="Перейти к следующему различию"/>
+                    </properties>
+                  </component>
+                  <component id="a9913" class="javax.swing.JButton" binding="bCompare">
+                    <constraints/>
+                    <properties>
+                      <icon value="icons/Menu/Undo.png"/>
+                      <maximumSize width="30" height="30"/>
+                      <minimumSize width="30" height="30"/>
+                      <preferredSize width="30" height="30"/>
+                      <text value=""/>
+                      <toolTipText value="Сравнить объекты"/>
+                    </properties>
+                  </component>
+                </children>
+              </toolbar>
+            </children>
+          </grid>
+          <grid id="98e2e" layout-manager="BorderLayout" hgap="0" vgap="0">
+            <constraints>
+              <splitpane position="right"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children/>
+          </grid>
+        </children>
+      </splitpane>
+    </children>
+  </grid>
+</form>
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
new file mode 100644
index 00000000..9fbbf626
--- /dev/null
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
@@ -0,0 +1,22 @@
+package Visual_DVM_2021.UI.Main;
+import Common.UI.Windows.Dialog.DialogFields;
+import Visual_DVM_2021.UI.Interface.FormWithSplitters;
+
+import javax.swing.*;
+public class SapforPackageFields implements DialogFields, FormWithSplitters {
+    private JPanel content;
+    public JSplitPane SCY;
+    private JToolBar tools;
+    public JLabel lObjectName;
+    private JButton bApplyObject;
+    private JButton bClose;
+    private JButton bPrevious;
+    private JButton bNext;
+    private JButton bCompare;
+    public JPanel getContent() {
+        return content;
+    }
+    public SapforPackageFields(){
+
+    }
+}
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.form b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.form
deleted file mode 100644
index 0a4eb17f..00000000
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.form
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Visual_DVM_2021.UI.Main.SapforPackageForm">
-  <grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
-    <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
-    </constraints>
-    <properties/>
-    <border type="none"/>
-    <children/>
-  </grid>
-</form>
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
index ad25a984..fcba1235 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
@@ -1,10 +1,78 @@
 package Visual_DVM_2021.UI.Main;
-import Common.UI.Windows.Dialog.DialogFields;
+import Common.Global;
+import Common.UI.Windows.Dialog.Dialog;
+import Common.UI.Windows.FormType;
+import GlobalData.FormsParams.DBForm;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageFields> {
+    SapforTasksPackage sapforTasksPackage = null;
 
-import javax.swing.*;
-public class SapforPackageForm implements DialogFields {
-    private JPanel content;
-    public JPanel getContent() {
-        return content;
+    private DBForm info = null;
+    public SapforPackageForm() {
+        super(SapforPackageFields.class);
+    }
+    @Override
+    public boolean NeedsScroll() {
+        return false;
+    }
+    @Override
+    public void CreateButtons() {
+    }
+    @Override
+    public void Init(Object... params) {
+        sapforTasksPackage = (SapforTasksPackage) params[0];
+        fields.lObjectName.setText(sapforTasksPackage.id);
+        /*
+        if (Global.db.sapforProfiles.size() > 0) {
+            for (Object key : Global.db.sapforProfiles.Data.keySet()) {
+                Global.db.sapforProfiles.ShowUI(key);
+                return;
+            }
+        } else {
+            Global.db.sapforProfiles.ShowUI();
+        }
+         */
+    }
+    @Override
+    public int getDefaultWidth() {
+        return 400;
+    }
+    @Override
+    public int getDefaultHeight() {
+        return 300;
+    }
+    @Override
+    public void CreateContent() {
+        super.CreateContent();
+        fields.LoadSplitters();
+        try {
+            LoadWindowParameters();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+    @Override
+    public void onClose() {
+        fields.SaveSplitters();
+        try {
+            SaveWindowParameters();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+    public void LoadWindowParameters() throws Exception {
+        if (Global.db.forms.Data.containsKey(FormType.SapforPackage)) {
+            info = Global.db.forms.Data.get(FormType.SapforPackage);
+            info.Apply(this);
+            return;
+        }
+        setSize(getDefaultWidth(), getDefaultHeight());
+    }
+    public void SaveWindowParameters() throws Exception {
+        if (info != null) {
+            info.Init(this);
+            Global.db.Update(info);
+        } else
+            Global.db.Insert(new DBForm(FormType.SapforPackage, this));
     }
 }