From 3e32e51e5780c52f4aa04607c8fd667854c3d40e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 15 Nov 2024 01:17:52 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=B0=D1=81=D0=BA=D0=B0=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B9=20=20=20=D0=B2=20=D1=81=D0=BB=D1=83=D1=87?=
 =?UTF-8?q?=D0=B0=D0=B5=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                            |  6 ------
 .../Common/Configuration/Configuration.java    | 18 +++++++++++++++++-
 .../TestingSystem/Common/TestingServer.java    | 13 +++++++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5bfac678..6d152ccf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,8 @@
   <component name="ChangeListManager">
     <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/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
index 5197808f..c19131ce 100644
--- a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
+++ b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
@@ -12,10 +12,10 @@ import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsArrayJson;
 import _VisualDVM.TestingSystem.Common.Settings.Settings;
 import _VisualDVM.TestingSystem.Common.Test.Json.TestsJson;
 import _VisualDVM.TestingSystem.Common.Test.Test;
-import _VisualDVM.Utils;
 import com.sun.org.glassfish.gmbal.Description;
 
 import javax.swing.*;
+import java.util.List;
 import java.util.Vector;
 public class Configuration extends riDBObject {
     //конфигурация = данные для пакета.
@@ -98,6 +98,22 @@ public class Configuration extends riDBObject {
         }
         return false;
     }
+    public boolean tryDeleteGroup(Group group) {
+        boolean flag = false;
+        ConfigurationCache unpacked = new ConfigurationCache(this);
+        List<GroupJson> actualGroups = new Vector<>();
+        for (GroupJson groupJson : unpacked.groupsJson.array) {
+            if (groupJson.id == group.id)
+                flag = true;
+            else actualGroups.add(groupJson);
+        }
+        if (flag) {
+            unpacked.groupsJson.array = actualGroups;
+            packedGroupsJson = Utils_.gson.toJson(unpacked.groupsJson);
+        }
+        return flag;
+    }
+
     /*
     public void updateTest(Test test){
         ConfigurationCache unpacked = new ConfigurationCache(this);
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index f828a6f5..b9312528 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -137,6 +137,19 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Utils_.forceDeleteWithCheck(group_test.getArchive());
                 Utils_.forceDeleteWithCheck(group_test.getServerPath());
             }
+            //--
+            //-
+            for (DVMConfiguration dvmConfiguration : db.dvmConfigurations.Data.values()) {
+                if (dvmConfiguration.tryDeleteGroup(group)){
+                    db.Update(dvmConfiguration);
+                }
+            }
+            for (SapforConfiguration sapforConfiguration : db.sapforConfigurations.Data.values()) {
+                if (sapforConfiguration.tryDeleteGroup(group)){
+                    db.Update(sapforConfiguration);
+                }
+            }
+            //--
         } else if (object instanceof ServerSapfor) {
             Utils_.forceDeleteWithCheck(
                     new File(