From 7bd4600a250a9406de2f343874a8e4dd9fd7b26d Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 16 Sep 2024 22:15:21 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                      | 9 +++++----
 .../Common/{ => Configuration}/Configuration.java        | 2 +-
 .../Common/TestingPackage/TestingPackage.java            | 4 ++--
 .../DVM/DVMConfiguration/DVMConfiguration.java           | 2 +-
 .../SAPFOR/SapforConfiguration/SapforConfiguration.java  | 2 +-
 src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)
 rename src/TestingSystem/Common/{ => Configuration}/Configuration.java (98%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a1413c3e..f10af9df 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,10 +8,11 @@
   <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/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/Common/Configuration.java b/src/TestingSystem/Common/Configuration/Configuration.java
similarity index 98%
rename from src/TestingSystem/Common/Configuration.java
rename to src/TestingSystem/Common/Configuration/Configuration.java
index eea8d16f..ca9488dc 100644
--- a/src/TestingSystem/Common/Configuration.java
+++ b/src/TestingSystem/Common/Configuration/Configuration.java
@@ -1,4 +1,4 @@
-package TestingSystem.Common;
+package TestingSystem.Common.Configuration;
 import Common.Database.DBObject;
 import Common.Database.riDBObject;
 import Common.Global;
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index 43cb77b2..f32379aa 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -4,7 +4,7 @@ import Common.Database.DBObject;
 import Common.Database.riDBObject;
 import Common.Global;
 import Common.Utils.Utils;
-import TestingSystem.Common.Configuration;
+import TestingSystem.Common.Configuration.Configuration;
 import TestingSystem.Common.TasksPackageState;
 import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import com.sun.org.glassfish.gmbal.Description;
@@ -26,7 +26,7 @@ public abstract class TestingPackage<J> extends riDBObject {
     public long ChangeDate = 0;
     @Description("DEFAULT 0")
     public int connectionErrosCount = 0;
-    //--
+    //--todo хранить их как json в текстовом формате.
     @Description("DEFAULT ''")
     public String packedConfigurationsIds = "";
     @Description("DEFAULT ''")
diff --git a/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java b/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java
index 9c1c8c3a..2f43a994 100644
--- a/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java
@@ -2,7 +2,7 @@ package TestingSystem.DVM.DVMConfiguration;
 import Common.Database.DBObject;
 import Common.Utils.Utils;
 import GlobalData.RunConfiguration.RunConfiguration;
-import TestingSystem.Common.Configuration;
+import TestingSystem.Common.Configuration.Configuration;
 
 import java.util.Vector;
 //конфгурация тестирования ДВМ
diff --git a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
index dd67e505..e6fd2d23 100644
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -1,7 +1,7 @@
 package TestingSystem.SAPFOR.SapforConfiguration;
 import Common.Database.DBObject;
 import Common.Global;
-import TestingSystem.Common.Configuration;
+import TestingSystem.Common.Configuration.Configuration;
 import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
diff --git a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
index 7758bccd..496f28dd 100644
--- a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
@@ -3,7 +3,7 @@ import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
-import TestingSystem.Common.Configuration;
+import TestingSystem.Common.Configuration.Configuration;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.TasksPackageState;
 import TestingSystem.Common.Test.Test;