no message

.idea/workspace.xml

@@ -7,15 +7,25 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMPackageCache.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/SapforPackageCache.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/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMPackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMPackageCache.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.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/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.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/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/1.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java

@@ -1,8 +1,4 @@
 package _VisualDVM.Passes.All;
-import Common.Utils.Utils_;
-import _VisualDVM.ServerObjectsCache.PackageCache;
-import _VisualDVM.ServerObjectsCache.VisualCaches;
-import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 public class SetSapforConfigurationEthalon extends EditSapforConfiguration {
     @Override
@@ -18,20 +14,6 @@ public class SetSapforConfigurationEthalon extends EditSapforConfiguration {
         if (getDb().CheckCurrent(Log, d, SapforPackage.class)) {
             target = getDb().getTable(d).getUI().getCurrent();
             SapforPackage sapforPackage = getDb().getTable(SapforPackage.class).getUI().getCurrent();
-            //-
-            PackageCache cache = (PackageCache) VisualCaches.GetCache(sapforPackage);
-            if (cache.configurationsJson.array.size() != 1) {
-                Log.Writeln_("В текущем пакете присутствует несколько конфигураций!");
-                return false;
-            }
-            ConfigurationJson configurationJson = cache.configurationsJson.array.get(0);
-            if (configurationJson.id != target.id) {
-                Log.Writeln_(
-                        "Конфигурация пакета " + Utils_.Brackets(configurationJson.description) +
-                                "\nне совпадает с текущей конфигурацией " + Utils_.Brackets(target.description) + "!");
-                return false;
-            }
-            //-
             target.ethalon_id = sapforPackage.id;
             return true;
         }

src/_VisualDVM/ServerObjectsCache/DVMPackageCache.java

@@ -1,16 +1,21 @@
 package _VisualDVM.ServerObjectsCache;
-import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
+import Common.Utils.Utils_;
+import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
+import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
 
 import java.util.Vector;
-public class DVMPackageCache extends PackageCache{
+public class DVMPackageCache extends PackageCache {
-    public DVMPackageCache(DVMPackage dvmPackage){
+    public DVMPackageCache(DVMPackage dvmPackage) {
         Vector<String> configurationsDescriptions = new Vector<>();
-
+        Vector<DVMPackageConfiguration> package_configurations = Global.testingServer.db.getVectorByFK(dvmPackage, DVMPackageConfiguration.class);
-        
+        for (DVMPackageConfiguration packageConfiguration: package_configurations){
-        for (ConfigurationJson configurationJson : configurationsJson.array)
+           String description = packageConfiguration.description;
-            configurationsDescriptions.add(configurationJson.description);
+           if (!Global.testingServer.db.dvmConfigurations.containsKey(packageConfiguration.dvmconfiguration_id)){
+               description= Utils_.strikeThrough(description);
+           }
+           configurationsDescriptions.add(description);
+        }
         confifurationsDescriptionsLine = String.join(";", configurationsDescriptions);
-
     }
 }

src/_VisualDVM/ServerObjectsCache/PackageCache.java

@@ -1,10 +1,4 @@
 package _VisualDVM.ServerObjectsCache;
-import Common.Utils.Utils_;
-import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
-import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson;
-import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
-
-import java.util.Vector;
 public class PackageCache extends VisualCache {
-    public String confifurationsDescriptionsLine = null;
+    public String confifurationsDescriptionsLine;
 }

src/_VisualDVM/ServerObjectsCache/SapforPackageCache.java

@@ -0,0 +1,22 @@
+package _VisualDVM.ServerObjectsCache;
+import Common.Utils.Utils_;
+import _VisualDVM.Global;
+import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
+
+import java.util.Vector;
+public class SapforPackageCache extends PackageCache {
+    public SapforPackageCache(SapforPackage sapforPackage) {
+        Vector<String> configurationsDescriptions = new Vector<>();
+        Vector<SapforPackageConfiguration> package_configurations = Global.testingServer.db.getVectorByFK(sapforPackage, SapforPackageConfiguration.class);
+        for (SapforPackageConfiguration packageConfiguration: package_configurations){
+            String description = packageConfiguration.description;
+            if (!Global.testingServer.db.sapforConfigurations.containsKey(packageConfiguration.sapforconfiguration_id)){
+                description= Utils_.strikeThrough(description);
+            }
+            configurationsDescriptions.add(description);
+        }
+        confifurationsDescriptionsLine = String.join(";", configurationsDescriptions);
+    }
+}

src/_VisualDVM/ServerObjectsCache/VisualCaches.java

@@ -1,10 +1,11 @@
 package _VisualDVM.ServerObjectsCache;
 import Common.Database.Objects.DBObject;
 import _VisualDVM.TestingSystem.Common.Test.Test;
-import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
+import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 
 import java.util.LinkedHashMap;
 //нужен со стороны клиента для серверных объектов, чтобы в сокет не класть лишнего.
@@ -27,11 +28,12 @@ public class VisualCaches {
     }
     //чтобы не трогать сами объекты и не сбить сериализацию
     static VisualCache createCache(Object object) {
-        if (object instanceof SapforConfiguration) return new SapforConfigurationCache((SapforConfiguration) object);
-        if (object instanceof DVMConfiguration) return new DVMConfigurationCache((DVMConfiguration) object);
-        if (object instanceof TestingPackage) return new PackageCache((TestingPackage) object);
-        if (object instanceof DVMSettings) return new DVMSettingsCache((DVMSettings) object);
         if (object instanceof Test) return new TestCache((Test) object);
+        if (object instanceof DVMSettings) return new DVMSettingsCache((DVMSettings) object);
+        if (object instanceof DVMConfiguration) return new DVMConfigurationCache((DVMConfiguration) object);
+        if (object instanceof DVMPackage) return new DVMPackageCache((DVMPackage) object);
+        if (object instanceof SapforConfiguration) return new SapforConfigurationCache((SapforConfiguration) object);
+        if (object instanceof SapforPackage) return new SapforPackageCache((SapforPackage) object);
         return new VisualCache();
     }
     public static VisualCache GetCache(DBObject object) {

src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java

@@ -4,7 +4,6 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import Common.Utils.Utils_;
 import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
-import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import com.sun.org.glassfish.gmbal.Description;
 
@@ -27,7 +26,7 @@ public abstract class TestingPackage<J> extends riDBObject {
     @Description("DEFAULT 0")
     public int connectionErrosCount = 0;
     public TasksPackageState state = TasksPackageState.Draft;
-   // public String packedConfigurationsJson = "";
+    public String packedConfigurationsJson = "";
     //json где хранятся задачи----------------------------------
     @Description("IGNORE")
     public J package_json = null;
@@ -84,7 +83,6 @@ public abstract class TestingPackage<J> extends riDBObject {
     }
     //----------------------------------------------------------
     public void saveConfigurations(Vector<? extends Configuration> configurations) {
-
     }
     //определить завершен пакет с ошибками или нет.
     public void checkFinishState() throws Exception {

src/_VisualDVM/TestingSystem/Common/TestingServer.java

@@ -558,16 +558,16 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
         Vector<SapforPackage> sapforPackages = new Vector<>();
         for (SapforConfiguration sapforConfiguration : configurations) {
-            SapforPackage sapforPackage = new SapforPackage(account, sapfor,new Vector_<>(sapforConfiguration), 1, Log);
+            SapforPackage sapforPackage = new SapforPackage(account, sapfor, new Vector_<>(sapforConfiguration), 1, Log);
             if (sapforPackage.tasksCount > 0) {
                 sapforPackages.add(sapforPackage);
             }
         }
-        if (sapforPackages.isEmpty()){
+        if (sapforPackages.isEmpty()) {
             Log.Writeln_("Не сформировано ни одного пакета");
             return;
         }
-        for (SapforPackage sapforPackage: sapforPackages){
+        for (SapforPackage sapforPackage : sapforPackages) {
             beforePublishAction(sapforPackage);
             db.InsertS(sapforPackage);
             afterPublishAction(sapforPackage);

src/_VisualDVM/TestingSystem/Common/TestsDatabase.java

@@ -98,7 +98,7 @@ public class TestsDatabase extends SQLiteDatabase {
         addTable(dvmConfigurationTests = new DVMConfigurationTestsDBTable());
         addTable(dvmConfigurationSettings = new DVMConfigurationSettingsDBTable());
         addTable(dvmPackages = new DVMPackageDBTable());
-        addTable(dvmPackageConfigurations =new DVMPackageConfigurationsDBTable());
+        addTable(dvmPackageConfigurations = new DVMPackageConfigurationsDBTable());
         //-
         addTable(serverSapfors = new ServerSapforsDBTable());
         addTable(sapforSettings = new SapforSettingsDBTable());
@@ -393,6 +393,7 @@ public class TestsDatabase extends SQLiteDatabase {
             Delete(file);
     }
     public void Patch() throws Exception {
+/*
         Vector<DVMPackageConfiguration> dvmPackageConfigurations_ = new Vector<>();
         for (DVMPackage dvmPackage: dvmPackages.Data.values()){
             if (!dvmPackage.packedConfigurationsJson.isEmpty()) {
@@ -401,6 +402,7 @@ public class TestsDatabase extends SQLiteDatabase {
                     DVMPackageConfiguration dvmPackageConfiguration = new DVMPackageConfiguration();
                     dvmPackageConfiguration.dvmpackage_id = dvmPackage.id;
                     dvmPackageConfiguration.dvmconfiguration_id = configurationJson.id;
+                    dvmPackageConfiguration.description =configurationJson.description;
                     dvmPackageConfigurations_.add(dvmPackageConfiguration);
                 }
             }
@@ -418,6 +420,7 @@ public class TestsDatabase extends SQLiteDatabase {
                     SapforPackageConfiguration sapforPackageConfiguration = new SapforPackageConfiguration();
                     sapforPackageConfiguration.sapforpackage_id = sapforPackage.id;
                     sapforPackageConfiguration.sapforconfiguration_id = configurationJson.id;
+                    sapforPackageConfiguration.description =configurationJson.description;
                     sapforPackageConfigurations_.add(sapforPackageConfiguration);
                 }
             }
@@ -426,6 +429,7 @@ public class TestsDatabase extends SQLiteDatabase {
         for (SapforPackageConfiguration sapforPackageConfiguration: sapforPackageConfigurations_)
             Insert(sapforPackageConfiguration);
         Commit();
+ */
 /*
         Vector<DVMConfigurationGroup> DVMConfigurationGroups=new Vector<>();
         //группы dvm конфигураций
@@ -612,4 +616,20 @@ public class TestsDatabase extends SQLiteDatabase {
         return res;
     }
     //--
+    public Vector<Integer> getDVMPackageConfigurationsIds(DVMPackage dvmPackage) {
+        Vector<Integer> res = new Vector<>();
+        for (DVMPackageConfiguration dvmPackageConfiguration : dvmPackageConfigurations.Data.values()) {
+            if (dvmPackageConfiguration.dvmpackage_id == dvmPackage.id)
+                res.add(dvmPackageConfiguration.dvmconfiguration_id);
+        }
+        return res;
+    }
+    public Vector<Integer> getSapforPackageConfigurationsIds(SapforPackage sapforPackage) {
+        Vector<Integer> res = new Vector<>();
+        for (SapforPackageConfiguration sapforPackageConfiguration : sapforPackageConfigurations.Data.values()) {
+            if (sapforPackageConfiguration.sapforpackage_id == sapforPackage.id)
+                res.add(sapforPackageConfiguration.sapforconfiguration_id);
+        }
+        return res;
+    }
 }

src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java

@@ -35,7 +35,7 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
         res.put(DVMConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
         res.put(DVMConfigurationTest.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
         res.put(DVMConfigurationSettings.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
-        res.put(DVMPackageConfiguration.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
+        res.put(DVMPackageConfiguration.class, new FKBehaviour(FKDataBehaviour.NONE, FKCurrentObjectBehaviuor.PASSIVE));
         return res;
     }
     //--

src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java

@@ -5,11 +5,8 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
-import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
-import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm;
 import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
-import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTest;
 
 import javax.swing.*;
 import java.util.LinkedHashMap;

src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java

@@ -10,7 +10,7 @@ import Common.Visual.Tables.RendererMilliseconds;
 import Common.Visual.Tables.RendererProgressBar;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.ServerObjectsCache.PackageCache;
+import _VisualDVM.ServerObjectsCache.DVMPackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
@@ -53,7 +53,7 @@ public class DVMPackagesForm extends RDataSetControlForm<DVMPackage> {
                 new ColumnInfo<DVMPackage>("конфигурации") {
                     @Override
                     public Object getFieldAt(DVMPackage object) {
-                        return ((PackageCache) VisualCaches.GetCache(object)).getConfifurationsDescriptionsLine();
+                        return ((DVMPackageCache) VisualCaches.GetCache(object)).confifurationsDescriptionsLine;
                     }
                 },
                 new ColumnInfo<DVMPackage>("задач") {

src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java

@@ -4,4 +4,5 @@ import Common.Database.Objects.iDBObject;
 public class DVMPackageConfiguration extends iDBObject {
     public int dvmpackage_id = CommonConstants.Nan;
     public int dvmconfiguration_id = CommonConstants.Nan;
+    public String description ="";
 }

src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java

@@ -6,6 +6,6 @@ public class DVMPackageConfigurationsDBTable extends iDBTable<DVMPackageConfigur
     }
     @Override
     public boolean isEqual(DVMPackageConfiguration o1, DVMPackageConfiguration o2) {
-        return o1.dvmpackage_id==o2.dvmpackage_id && o1.dvmconfiguration_id==o2.dvmconfiguration_id;
+        return o1.dvmpackage_id == o2.dvmpackage_id && o1.dvmconfiguration_id == o2.dvmconfiguration_id;
     }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java

@@ -33,7 +33,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
         res.put(SapforConfigurationGroup.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
         res.put(SapforConfigurationTest.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
         res.put(SapforConfigurationSettings.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
-        res.put(SapforPackageConfiguration.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.PASSIVE));
+        res.put(SapforPackageConfiguration.class, new FKBehaviour(FKDataBehaviour.NONE, FKCurrentObjectBehaviuor.PASSIVE));
         return res;
     }
     @Override

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java

@@ -10,7 +10,7 @@ import Common.Visual.Tables.RendererMilliseconds;
 import Common.Visual.Tables.RendererProgressBar;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.ServerObjectsCache.PackageCache;
+import _VisualDVM.ServerObjectsCache.SapforPackageCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
@@ -41,7 +41,7 @@ public class SapforPackagesForm extends RDataSetControlForm<SapforPackage> {
                 new ColumnInfo<SapforPackage>("конфигурации") {
                     @Override
                     public Object getFieldAt(SapforPackage object) {
-                        return ((PackageCache) VisualCaches.GetCache(object)).getConfifurationsDescriptionsLine();
+                        return ((SapforPackageCache) VisualCaches.GetCache(object)).confifurationsDescriptionsLine;
                     }
                 },
                 new ColumnInfo<SapforPackage>("задач") {

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java

@@ -4,4 +4,5 @@ import Common.Database.Objects.iDBObject;
 public class SapforPackageConfiguration extends iDBObject {
     public int sapforpackage_id = CommonConstants.Nan;
     public int sapforconfiguration_id = CommonConstants.Nan;
+    public String description ="";
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.java

@@ -1,12 +1,11 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration;
 import Common.Database.Tables.iDBTable;
-import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
 public class SapforPackageConfigurationsDBTable extends iDBTable<SapforPackageConfiguration> {
     public SapforPackageConfigurationsDBTable() {
         super(SapforPackageConfiguration.class);
     }
     @Override
     public boolean isEqual(SapforPackageConfiguration o1, SapforPackageConfiguration o2) {
-        return o1.sapforpackage_id==o2.sapforpackage_id && o1.sapforconfiguration_id==o2.sapforconfiguration_id;
+        return o1.sapforpackage_id == o2.sapforpackage_id && o1.sapforconfiguration_id == o2.sapforconfiguration_id;
     }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java

@@ -194,8 +194,8 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
                 }
                 Print("сравнение завершено");
                 log.Writeln_("Различий с эталоном: " + testingPackage.mismatchesCount);
-                if (testingPackage.mismatchesCount>0){
+                if (testingPackage.mismatchesCount > 0) {
-                    testingPackage.doneTasksCount-=testingPackage.mismatchesCount;
+                    testingPackage.doneTasksCount -= testingPackage.mismatchesCount;
                     testingPackage.state = TasksPackageState.DoneWithErrors;
                 }
                 return;