From 910901f9405f30644cc75be578b1dd0a6676559f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 16 Nov 2024 22:03:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D1=83=D0=B4=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=B2=D1=81=D0=B5=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=82=D0=BE=20=D0=B3=D0=B4=D0=B5=20=D0=BE=D0=BD?=
 =?UTF-8?q?=20=D0=B1=D1=8B=D0=BB=20=D1=8D=D1=82=D0=B0=D0=BB=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=BC=20=D0=BE=D0=B1=D0=BD=D1=83=D0=BB=D1=8F=D1=8E=D1=82?=
 =?UTF-8?q?=D1=81=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  1 -
 .../Common/Configuration/Configuration.java   | 25 -------------------
 .../TestingSystem/Common/TestingServer.java   |  8 ++++++
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4f4789d0..6d152ccf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,7 +9,6 @@
     <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/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/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
index 4ce01788..4a659be3 100644
--- a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
+++ b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
@@ -87,7 +87,6 @@ public class Configuration extends riDBObject {
     public String getDialogName() {
         return description;
     }
-    //--
     //работает со стороны сервера.
     public boolean tryUpdateGroup(Group group) {
         ConfigurationCache unpacked = new ConfigurationCache(this);
@@ -157,7 +156,6 @@ public class Configuration extends riDBObject {
         }
         return flag;
     }
-
     public boolean tryDeleteTests(LinkedHashMap<Integer, Test> tests) {
         boolean flag = false;
         ConfigurationCache unpacked = new ConfigurationCache(this);
@@ -173,27 +171,4 @@ public class Configuration extends riDBObject {
         }
         return flag;
     }
-
-    /*
-    public void updateTest(Test test){
-        ConfigurationCache unpacked = new ConfigurationCache(this);
-        for (TestJson testJson : unpacked.testsJson.array) {
-            if (testJson.id == test.id) {
-                testJson.description = test.description;
-                testJson.language = String.valueOf(group.language);
-            }
-        }
-        packedGroupsJson = Utils_.gson.toJson(unpacked);
-    }
-
-    public boolean containsTest(int test_id) {
-        ConfigurationCache unpacked = new ConfigurationCache(this);
-        for (TestJson testJson : unpacked.testsJson.array) {
-            if (testJson.id == test_id) {
-                return true;
-            }
-        }
-        return false;
-    }
-     */
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 58b4e7e5..874fbbaa 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -192,6 +192,14 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             Utils_.forceDeleteWithCheck(workspace);
         } else if (object instanceof SapforPackage) {
             SapforPackage sapforPackage = (SapforPackage) object;
+            //--
+            for (SapforConfiguration sapforConfiguration: db.sapforConfigurations.Data.values()){
+                if (sapforConfiguration.ethalon_id==sapforPackage.id){
+                    sapforConfiguration.ethalon_id= CommonConstants.Nan;
+                    db.Update(sapforConfiguration);
+                }
+            }
+            //--
             File workspace = sapforPackage.getLocalWorkspace();
             Utils_.forceDeleteWithCheck(workspace);
         } else if (object instanceof DVMSettings) {