перевод тестовых описания данных обратно в таблицы. нужно для обобщения описаний типовых проходов

src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java

@@ -20,6 +20,14 @@ public class GroupsDBTable extends iDBTable<Group> {
     }
     //------------------------------------------------>>>
     @Override
+    public String getSingleDescription() {
+        return "группа тестов";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "группы";
+    }
+    @Override
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
         res.put(Test.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java

@@ -26,14 +26,6 @@ public class GroupsForm extends DataSetControlForm<Group> {
         return Current.Group;
     }
     @Override
-    protected String getSingleDescription() {
-        return "группа тестов";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "группы";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -63,7 +55,7 @@ public class GroupsForm extends DataSetControlForm<Group> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.SynchronizeTests,
                 PassCode.ConvertCorrectnessTests) {
             {

src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java

@@ -13,6 +13,14 @@ public class TestDBTable extends iDBTable<Test> {
         super(Test.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "тест";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "тесты";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new TestsForm(this, mountPanel);
     }

src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java

@@ -18,14 +18,6 @@ public class TestsForm extends DataSetControlForm<Test> {
         return Current.Test;
     }
     @Override
-    protected String getSingleDescription() {
-        return "тест";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "тесты";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -58,7 +50,7 @@ public class TestsForm extends DataSetControlForm<Test> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()) {
+        return new DataMenuBar(dataSource.getPluralDescription()) {
             {
                 addMenus(new AddTestMenu(), new EditTestMenu());
                 addPasses(PassCode.DownloadTest, PassCode.DeleteTest);

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

@@ -11,6 +11,14 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
         super(DVMConfiguration.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "конфигурация";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "конфигурации";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DVMConfigurationsForm(this, mountPanel);
     }

src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java

@@ -21,14 +21,6 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
         return Current.DVMConfiguration;
     }
     @Override
-    protected String getSingleDescription() {
-        return "конфигурация";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "конфигурации";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -76,7 +68,7 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.PublishConfiguration,
                 PassCode.EditConfiguration,
                 PassCode.ShowCurrentDVMConfigurationTests,

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

@@ -11,6 +11,14 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
         super(DVMPackage.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "пакет";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "пакеты";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DVMPackagesForm(this, mountPanel);
     }

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

@@ -27,14 +27,6 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
         return Current.DVMPackage;
     }
     @Override
-    protected String getSingleDescription() {
-        return "пакет";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "пакеты";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -112,7 +104,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription()) {
+        return new DataMenuBar(dataSource.getPluralDescription()) {
             {
                 addPasses(PassCode.SynchronizeTests);
                 addSeparator();

src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java

@@ -11,6 +11,14 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
         super(DVMSettings.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "параметры тестирования";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "параметры тестирования";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DVMSettingsForm(this, mountPanel);
     }

src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java

@@ -18,14 +18,6 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
         return Current.DVMSettings;
     }
     @Override
-    protected String getSingleDescription() {
-        return "параметры тестирования";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "параметры тестирования";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -70,7 +62,7 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.PublishDVMSettings,
                 PassCode.CloneDVMSettings,
                 PassCode.EditDVMSettings,

src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java

@@ -6,12 +6,19 @@ import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksForm;
 
 import javax.swing.*;
 public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
-    //todo обобщить бы наличие фильтров для всех таблиц.
     DVMPackage target;
     public DVMRunTasksSet() {
         super(Integer.class, DVMRunTask.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "задача";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "задачи";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new DVMRunTasksForm(this, mountPanel);
     }

src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java

@@ -23,14 +23,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
         return Current.DVMRunTask;
     }
     @Override
-    protected String getSingleDescription() {
-        return "задача";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "задачи";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -90,7 +82,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
     }
     @Override
     protected void createFilters() {

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

@@ -13,6 +13,14 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
         super(SapforConfiguration.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "конфигурация";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "конфигурации";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new SapforConfigurationsForm(this, mountPanel);
     }

src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java

@@ -22,14 +22,6 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
         return Current.SapforConfiguration;
     }
     @Override
-    protected String getSingleDescription() {
-        return "конфигурация";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "конфигурации";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -79,7 +71,7 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.PublishSapforConfiguration,
                 PassCode.EditSapforConfiguration,
                 PassCode.ShowCurrentSAPFORConfigurationTests,

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java

@@ -11,6 +11,14 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
         super(SapforPackage.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "пакет";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "пакеты";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new SapforPackagesForm(this, mountPanel);
     }

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

@@ -27,14 +27,6 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
         return Current.SapforPackage;
     }
     @Override
-    protected String getSingleDescription() {
-        return "пакет";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "пакеты";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -92,7 +84,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeTests) {
             {
                 addSeparator();
                 addPasses(PassCode.AbortSapforPackage);

src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java

@@ -17,6 +17,14 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
         super(SapforSettings.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "параметры тестирования";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "параметры тестирования";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new SapforSettingsForm(this, mountPanel);
     }

src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java

@@ -17,14 +17,6 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
         return Current.SapforSettings;
     }
     @Override
-    protected String getSingleDescription() {
-        return "параметры тестирования";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "параметры тестирования";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -51,7 +43,7 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.PublishSapforSettings,
                 PassCode.CloneSapforSettings,
                 PassCode.EditSapforSettings,

src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java

@@ -13,6 +13,14 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
         super(SapforSettingsCommand.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "команда";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "команды";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new SapforSettingsCommandsForm(this, mountPanel);
     }

src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java

@@ -18,14 +18,6 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
         return Current.SapforSettingsCommand;
     }
     @Override
-    protected String getSingleDescription() {
-        return "команда";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "команды";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -46,7 +38,7 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.PublishSapforSettingsCommand,
                 PassCode.EditSapforSettingsCommand,
                 PassCode.DeleteSapforSettingsCommand);

src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java

@@ -11,6 +11,14 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
         super(ServerSapfor.class);
     }
     @Override
+    public String getSingleDescription() {
+        return "версия SAPFOR";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "версии SAPFOR";
+    }
+    @Override
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new ServerSapforsForm(this, mountPanel);
     }

src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java

@@ -20,14 +20,6 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
         return Current.ServerSapfor;
     }
     @Override
-    protected String getSingleDescription() {
-        return "версия SAPFOR";
-    }
-    @Override
-    protected String getPluralDescription() {
-        return "версии SAPFOR";
-    }
-    @Override
     protected boolean hasCheckBox() {
         return true;
     }
@@ -71,7 +63,7 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(getPluralDescription(),
+        return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.CompileServerSapfor,
                 PassCode.ShowSapforCompilationOut,
                 PassCode.ShowSapforCompilationErr,