From dae90b6c5e88c749cde2c00b88562977eb4e1650 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 18 Nov 2023 02:47:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B9=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |   7 +-
 src/Common/UI/UI.java                         |   4 -
 src/Common/UI/Windows/FormType.java           |   3 +-
 .../Passes/All/ShowSapforTaskPackage.java     |  33 -----
 src/Visual_DVM_2021/Passes/PassCode_2021.java |   3 -
 .../UI/Main/SapforPackageFields.form          | 127 ------------------
 .../UI/Main/SapforPackageFields.java          |  37 -----
 .../UI/Main/SapforPackageForm.java            |  83 ------------
 8 files changed, 5 insertions(+), 292 deletions(-)
 delete mode 100644 src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
 delete mode 100644 src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
 delete mode 100644 src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
 delete mode 100644 src/Visual_DVM_2021/UI/Main/SapforPackageForm.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a5bd67f5..81655e17 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,10 @@
   </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/Passes/Server/DeleteServerAccountObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.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/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/UI/Main/SapforPackageFields.form" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="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 6850a264..ffab07d2 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -254,7 +254,6 @@ 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();
@@ -365,9 +364,6 @@ 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 2f614f15..ec02209b 100644
--- a/src/Common/UI/Windows/FormType.java
+++ b/src/Common/UI/Windows/FormType.java
@@ -5,6 +5,5 @@ public enum FormType {
     Main,
     SearchReplace,
     Components,
-    RemoteFileChooser,
-    SapforPackage, Profiles
+    RemoteFileChooser, Profiles
 }
diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
deleted file mode 100644
index 70115b87..00000000
--- a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.UI.UI;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-import TestingSystem.DVM.TasksPackage.TasksPackageState;
-import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
-public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
-    @Override
-    public String getIconPath() {
-        return "/icons/VariantsCoverage.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.SapforTasksPackage)) {
-            target = Current.getSapforTasksPackage();
-            if (!target.state.equals(TasksPackageState.Done)) {
-                Log.Writeln_("Пакет не завершен!");
-                return false;
-            }
-            return target.isLoaded() || passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(target);
-        }
-        return false;
-    }
-    @Override
-    protected void body() throws Exception {
-        UI.getSapforPackageWindow().ShowDialog("Отображение пакета задач SAPFOR", target);
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index c30bc2fa..d100dee0 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -296,7 +296,6 @@ public enum PassCode_2021 {
     DeleteSapforConfigurationCommand,
     //->
     DownloadSapforTasksPackage,
-    ShowSapforTaskPackage, //временный проход на демонстрацию дерева файлов и версий пакета.
     OpenSapforEtalonVersion,
     OpenSapforVersion,
     PublishServerSapfor,
@@ -324,8 +323,6 @@ public enum PassCode_2021 {
                 return "Открыть текущую версию SAPFOR как проект";
             case UnpackSapforTasksPackage:
                 return "Распаковка пакета задач SAPFOR";
-            case ShowSapforTaskPackage:
-                return "Отобразить пакет задач SAPFOR";
             case DownloadSapforTasksPackage:
                 return "Загрузить пакет задач SAPFOR";
             case AbortSapforTaskPackage:
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
deleted file mode 100644
index baa6588e..00000000
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
+++ /dev/null
@@ -1,127 +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.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>
-              <grid id="a1b9a" binding="treePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                <constraints border-constraint="Center"/>
-                <properties/>
-                <border type="none"/>
-                <children/>
-              </grid>
-            </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
deleted file mode 100644
index 60c4cdef..00000000
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package Visual_DVM_2021.UI.Main;
-import Common.UI.Windows.Dialog.DialogFields;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-import Visual_DVM_2021.UI.Interface.FormWithSplitters;
-
-import javax.swing.*;
-public class SapforPackageFields implements DialogFields, FormWithSplitters {
-    SapforTasksPackage object = null;
-
-    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;
-    private JPanel treePanel;
-    public JPanel getContent() {
-        return content;
-    }
-    public JPanel getTreePanel(){return treePanel;}
-    public SapforPackageFields(){}
-    public SapforPackageFields(SapforTasksPackage object_in){
-        LoadSplitters();
-        object = object_in;
-        //--
-        lObjectName.setText(String.valueOf(object.id));
-        /*
-        treePanel.add(
-                new JScrollPane(
-                        new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(object))));
-
-         */
-    }
-}
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
deleted file mode 100644
index 5c392d9d..00000000
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package Visual_DVM_2021.UI.Main;
-import Common.Global;
-import Common.UI.Windows.Dialog.Dialog;
-import Common.UI.Windows.FormType;
-import GlobalData.FormsParams.DBForm;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageFields> {
-    SapforTasksPackage sapforTasksPackage = null;
-    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);
-        /*
-        fields.getTreePanel().add(
-                new JScrollPane(
-                        new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(sapforTasksPackage))));
-
-         */
-        /*
-        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));
-    }
-}