diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 54ba3519..86322a3c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,6 +9,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java
index c9c9c27e..3da53482 100644
--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -19,6 +19,13 @@ public class DataSet extends DataSetAnchestor {
k = k_in;
d = d_in;
}
+ //--
+ public String getPluralDescription() {
+ return "";
+ }
+ public String getSingleDescription() {
+ return "";
+ }
//---
protected DataSetControlForm createUI(JPanel mountPanel) {
return null;
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index b1b01562..b867d5d6 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -72,12 +72,6 @@ public class DataSetControlForm extends ControlForm Vector getFilters(Class f) {
Vector res = new Vector<>();
for (DBObjectFilter_ filter_ : allFilters) {
@@ -342,7 +336,7 @@ public class DataSetControlForm extends ControlForm extends ControlForm extends ControlForm extends ControlForm {
super(Compiler.class);
}
@Override
+ public String getSingleDescription() {
+ return "компилятор";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "компиляторы";
+ }
+ @Override
public LinkedHashMap, FKBehaviour> getFKDependencies() {
LinkedHashMap, FKBehaviour> res = new LinkedHashMap<>();
res.put(Makefile.class, new FKBehaviour(FKDataBehaviour.DROP, FKCurrentObjectBehaviuor.PASSIVE));
diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
index 13485224..e6a39520 100644
--- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
@@ -19,14 +19,6 @@ public class CompilersForm extends DataSetControlForm {
return Current.Compiler;
}
@Override
- protected String getSingleDescription() {
- return "компилятор";
- }
- @Override
- protected String getPluralDescription() {
- return "компиляторы";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -68,7 +60,7 @@ public class CompilersForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
+ return new DataMenuBar(dataSource.getPluralDescription(), PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
index c8a405fb..f957f324 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -11,6 +11,14 @@ public class DVMParameterDBTable extends iDBTable {
super(DVMParameter.class);
}
@Override
+ public String getSingleDescription() {
+ return "параметр DVM системы";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "параметры DVM";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMParametersForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java b/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
index d2f04b9a..31415116 100644
--- a/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
+++ b/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
@@ -18,14 +18,6 @@ public class DVMParametersForm extends DataSetControlForm {
return Current.DVMParameterValue;
}
@Override
- protected String getSingleDescription() {
- return "параметр DVM системы";
- }
- @Override
- protected String getPluralDescription() {
- return "параметры DVM";
- }
- @Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
@@ -48,7 +40,7 @@ public class DVMParametersForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddDVMParameter,
PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter);
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
index 5527fcea..108aff83 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -11,6 +11,14 @@ public class EnvironmentValuesDBTable extends iDBTable {
super(EnvironmentValue.class);
}
@Override
+ public String getSingleDescription() {
+ return "переменная окружения";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "переменные окружения";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new EnvironmentsValuesForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
index 85a97341..c8a93880 100644
--- a/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
+++ b/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
@@ -19,14 +19,6 @@ public class EnvironmentsValuesForm extends DataSetControlForm
return Current.EnvironmentValue;
}
@Override
- protected String getSingleDescription() {
- return "переменная окружения";
- }
- @Override
- protected String getPluralDescription() {
- return "переменные окружения";
- }
- @Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
@@ -48,7 +40,7 @@ public class EnvironmentsValuesForm extends DataSetControlForm
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,
diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
index 6bfffa3d..41da6575 100644
--- a/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
@@ -25,6 +25,14 @@ public class MachinesDBTable extends iDBTable {
super(Machine.class);
}
@Override
+ public String getSingleDescription() {
+ return "машина";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "машины";
+ }
+ @Override
public LinkedHashMap, FKBehaviour> getFKDependencies() {
LinkedHashMap, FKBehaviour> res = new LinkedHashMap<>();
//-
diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
index 61b8a384..9b5ed720 100644
--- a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
@@ -22,14 +22,6 @@ public class MachinesForm extends DataSetControlForm {
return Current.Machine;
}
@Override
- protected String getSingleDescription() {
- return "машина";
- }
- @Override
- protected String getPluralDescription() {
- return "машины";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -64,7 +56,7 @@ public class MachinesForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddMachine,
PassCode.EditMachine,
PassCode.DeleteMachine) {
diff --git a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
index 575afef6..0075d8f7 100644
--- a/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
@@ -18,6 +18,14 @@ public class MakefilesDBTable extends iDBTable {
super(Makefile.class);
}
@Override
+ public String getSingleDescription() {
+ return "мейкфайл";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "мейкфайлы";
+ }
+ @Override
public LinkedHashMap, FKBehaviour> getFKDependencies() {
LinkedHashMap, FKBehaviour> res = new LinkedHashMap<>();
res.put(Module.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
diff --git a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
index 6fa8276a..f72d9731 100644
--- a/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
+++ b/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
@@ -20,14 +20,6 @@ public class MakefilesForm extends DataSetControlForm {
return Current.Makefile;
}
@Override
- protected String getSingleDescription() {
- return "мейкфайл";
- }
- @Override
- protected String getPluralDescription() {
- return "мейкфайлы";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -58,7 +50,7 @@ public class MakefilesForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,
diff --git a/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java b/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
index 8af83736..5a6811ea 100644
--- a/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
+++ b/src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
@@ -9,6 +9,14 @@ public class ModulesDBTable extends iDBTable {
super(Module.class);
}
@Override
+ public String getSingleDescription() {
+ return "языковой модуль";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "языковые модули";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ModulesForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java b/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
index 079da06b..e519d870 100644
--- a/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
+++ b/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
@@ -19,14 +19,6 @@ public class ModulesForm extends DataSetControlForm {
return Current.Module;
}
@Override
- protected String getSingleDescription() {
- return "языковой модуль";
- }
- @Override
- protected String getPluralDescription() {
- return "языковые модули";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -60,7 +52,7 @@ public class ModulesForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
+ return new DataMenuBar(dataSource.getPluralDescription(), PassCode.EditModule);
}
@Override
public boolean isObjectVisible(Module object) {
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
index 77650e4c..40741ba1 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -19,6 +19,14 @@ public class RunConfigurationsDBTable extends iDBTable {
super(RunConfiguration.class);
}
@Override
+ public String getSingleDescription() {
+ return "конфигурация запуска";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "конфигурации запуска";
+ }
+ @Override
public LinkedHashMap, FKBehaviour> getFKDependencies() {
LinkedHashMap, FKBehaviour> res = new LinkedHashMap<>();
res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
index 2702ccb2..cb66649a 100644
--- a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
+++ b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
@@ -18,14 +18,6 @@ public class RunConfigurationsForm extends DataSetControlForm
return Current.RunConfiguration;
}
@Override
- protected String getSingleDescription() {
- return "конфигурация запуска";
- }
- @Override
- protected String getPluralDescription() {
- return "конфигурации запуска";
- }
- @Override
public String[] getUIColumnNames() {
return new String[]{
"Команда",
@@ -64,7 +56,7 @@ public class RunConfigurationsForm extends DataSetControlForm
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.Run,
PassCode.AddRunConfiguration,
PassCode.EditRunConfiguration,
diff --git a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
index 6b67218e..c06b7dbc 100644
--- a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
+++ b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
@@ -17,6 +17,14 @@ public class SapforProfilesDBTable extends iDBTable {
super(SapforProfile.class);
}
@Override
+ public String getPluralDescription() {
+ return "профили SAPFOR";
+ }
+ @Override
+ public String getSingleDescription() {
+ return "профиль SAPFOR";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforProfilesForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java b/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
index d9975e89..492d0e96 100644
--- a/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
+++ b/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
@@ -19,14 +19,6 @@ public class SapforProfilesForm extends DataSetControlForm {
return Current.SapforProfile;
}
@Override
- protected String getPluralDescription() {
- return "профили SAPFOR";
- }
- @Override
- protected String getSingleDescription() {
- return "профиль SAPFOR";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -50,7 +42,7 @@ public class SapforProfilesForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveProfile,
PassCode.EditProfile,
PassCode.ApplyProfile,
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
index bb597396..c1ed7148 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
@@ -17,6 +17,14 @@ public class CompilationTasksDBTable extends iDBTable {
super(CompilationTask.class);
}
@Override
+ public String getSingleDescription() {
+ return "задача на компиляцию";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "задачи на компиляцию";
+ }
+ @Override
public LinkedHashMap, FKBehaviour> getFKDependencies() {
LinkedHashMap, FKBehaviour> res = new LinkedHashMap<>();
res.put(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
index c3a67426..2def04ef 100644
--- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
@@ -20,14 +20,6 @@ public class CompilationTasksForm extends DataSetControlForm {
return Current.CompilationTask;
}
@Override
- protected String getSingleDescription() {
- return "задача на компиляцию";
- }
- @Override
- protected String getPluralDescription() {
- return "задачи на компиляцию";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -65,7 +57,7 @@ public class CompilationTasksForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
+ return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
}
@Override
public boolean isObjectVisible(CompilationTask object) {
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
index 8bd51d38..984f3929 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
@@ -11,6 +11,14 @@ public class RunTasksDBTable extends iDBTable {
super(RunTask.class);
}
@Override
+ public String getSingleDescription() {
+ return "задача на запуск";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "задачи на запуск";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new RunTasksForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
index a2e09eed..de2b2197 100644
--- a/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
+++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
@@ -20,14 +20,6 @@ public class RunTasksForm extends DataSetControlForm {
return Current.RunTask;
}
@Override
- protected String getSingleDescription() {
- return "задача на запуск";
- }
- @Override
- protected String getPluralDescription() {
- return "задачи на запуск";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -77,7 +69,7 @@ public class RunTasksForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
+ return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteRunTasks);
}
@Override
public boolean isObjectVisible(RunTask object) {
diff --git a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
index e4155a4d..697ba9fc 100644
--- a/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
+++ b/src/_VisualDVM/GlobalData/User/UI/UsersForm.java
@@ -20,14 +20,6 @@ public class UsersForm extends DataSetControlForm {
return Current.User;
}
@Override
- protected String getSingleDescription() {
- return "пользователь";
- }
- @Override
- protected String getPluralDescription() {
- return "пользователи";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -65,7 +57,7 @@ public class UsersForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,
diff --git a/src/_VisualDVM/GlobalData/User/UsersDBTable.java b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
index f621df36..38fcb955 100644
--- a/src/_VisualDVM/GlobalData/User/UsersDBTable.java
+++ b/src/_VisualDVM/GlobalData/User/UsersDBTable.java
@@ -18,6 +18,14 @@ public class UsersDBTable extends iDBTable {
super(User.class);
}
@Override
+ public String getSingleDescription() {
+ return "пользователь";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "пользователи";
+ }
+ @Override
public LinkedHashMap, FKBehaviour> getFKDependencies() {
LinkedHashMap, FKBehaviour> res = new LinkedHashMap<>();
res.put(CompilationTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
diff --git a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
index c48a2e2d..1eaff601 100644
--- a/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
+++ b/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
@@ -9,6 +9,14 @@ public class ArraysDBTable extends DBTable {
super(String.class, DBArray.class);
}
@Override
+ public String getSingleDescription() {
+ return "массив";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "сохранённые состояния";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DBArraysForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java b/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
index e57e1c0c..6c50e984 100644
--- a/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
+++ b/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
@@ -15,14 +15,6 @@ public class DBArraysForm extends DataSetControlForm {
return Current.DBArray;
}
@Override
- protected String getSingleDescription() {
- return "массив";
- }
- @Override
- protected String getPluralDescription() {
- return "сохранённые состояния";
- }
- @Override
public String[] getUIColumnNames() {
return new String[]{"Имя"};
}
@@ -47,7 +39,7 @@ public class DBArraysForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription()) {
+ return new DataMenuBar(dataSource.getPluralDescription()) {
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java
index fa5e5fa4..0bfa16a7 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java
@@ -9,6 +9,14 @@ public class ProjectArraysSet extends DataSet {
super(Long.class, ProjectArray.class);
}
@Override
+ public String getSingleDescription() {
+ return "массив";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "объявленные массивы";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ProjectArraysForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
index 3d36a832..8f60027d 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
@@ -29,14 +29,6 @@ public class ProjectArraysForm extends DataSetControlForm {
return Current.ProjectArray;
}
@Override
- protected String getSingleDescription() {
- return "массив";
- }
- @Override
- protected String getPluralDescription() {
- return "объявленные массивы";
- }
- @Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
index 68829afc..0f87ba6c 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
@@ -11,6 +11,14 @@ public class ParallelRegionsSet extends DataSet {
super(BigInteger.class, ParallelRegion.class);
}
@Override
+ public String getSingleDescription() {
+ return "область распараллеливания";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "области распараллеливания";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ParallelRegionsForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
index 8b09ad2f..c6d9bc81 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
@@ -16,14 +16,6 @@ public class ParallelRegionsForm extends DataSetControlForm {
return Current.ParallelRegionInfo;
}
@Override
- protected String getSingleDescription() {
- return "область распараллеливания";
- }
- @Override
- protected String getPluralDescription() {
- return "области распараллеливания";
- }
- @Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java b/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java
index 72f05605..b91f1b08 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java
@@ -9,6 +9,10 @@ public class ParallelVariantsSet extends DataSet {
super(String.class, ParallelVariant.class);
}
@Override
+ public String getPluralDescription() {
+ return "варианты";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ParallelVariantsForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
index 3dfb436c..1fd02d15 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
@@ -19,10 +19,6 @@ public class ParallelVariantsForm extends DataSetControlForm {
return Current.ParallelVariant;
}
@Override
- protected String getPluralDescription() {
- return "варианты";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -84,7 +80,7 @@ public class ParallelVariantsForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.ShowAllParallelVariants,
PassCode.ShowParallelVariantsCoverage,
PassCode.PredictParallelVariants,
diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
index 6b14454d..96eca889 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
@@ -13,6 +13,14 @@ public class BugReportsDBTable extends DBTable {
super(String.class, BugReport.class);
}
@Override
+ public String getSingleDescription() {
+ return "отчёт об ошибке";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "отчёты об ошибках";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new BugReportsForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
index a1b4b924..1f988b2e 100644
--- a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
+++ b/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
@@ -35,14 +35,6 @@ public class BugReportsForm extends DataSetControlForm {
return Current.BugReport;
}
@Override
- protected String getSingleDescription() {
- return "отчёт об ошибке";
- }
- @Override
- protected String getPluralDescription() {
- return "отчёты об ошибках";
- }
- @Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",
@@ -92,7 +84,7 @@ public class BugReportsForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
diff --git a/src/_VisualDVM/Repository/Component/ComponentsSet.java b/src/_VisualDVM/Repository/Component/ComponentsSet.java
index 4c9d2004..db014c43 100644
--- a/src/_VisualDVM/Repository/Component/ComponentsSet.java
+++ b/src/_VisualDVM/Repository/Component/ComponentsSet.java
@@ -9,6 +9,14 @@ public class ComponentsSet extends DataSet {
super(ComponentType.class, Component.class);
}
@Override
+ public String getSingleDescription() {
+ return "компонент";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "компоненты";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ComponentsForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java b/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
index 2ca7d998..fa3bd50c 100644
--- a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
+++ b/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
@@ -23,14 +23,6 @@ public class ComponentsForm extends DataSetControlForm {
return Current.Component;
}
@Override
- protected String getSingleDescription() {
- return "компонент";
- }
- @Override
- protected String getPluralDescription() {
- return "компоненты";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -69,7 +61,7 @@ public class ComponentsForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
+ return new DataMenuBar(dataSource.getPluralDescription(), PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog) {
@@ -84,7 +76,7 @@ public class ComponentsForm extends DataSetControlForm {
}
}
);
- Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
+ MainModule_.instance.getPass(PassCode.PublishComponent).setControlsVisible(false);
}
};
}
diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
index 3b2baefa..60bd44cb 100644
--- a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
+++ b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
@@ -10,6 +10,14 @@ public class SubscriberWorkspaceDBTable extends iDBTable {
public SubscriberWorkspaceDBTable() {
super(SubscriberWorkspace.class);
}
+ @Override
+ public String getSingleDescription() {
+ return "рабочая папка";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "рабочие папки";
+ }
public SubscriberWorkspace findWorkspace(String email, String machineURL, String login) {
return this.Data.values().stream().filter(subscriberWorkspace ->
subscriberWorkspace.email.equals(email) &&
diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java b/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
index 7879ac49..dd25cc60 100644
--- a/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
+++ b/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
@@ -17,14 +17,6 @@ public class SubscriberWorkspacesForm extends DataSetControlForm {
super(String.class, Subscriber.class);
}
@Override
+ public String getSingleDescription() {
+ return "адресат";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "адресаты";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SubsribersForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java b/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
index 9fc18174..0734ca2c 100644
--- a/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
+++ b/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
@@ -20,14 +20,6 @@ public class SubsribersForm extends DataSetControlForm {
return Current.Subscriber;
}
@Override
- protected String getSingleDescription() {
- return "адресат";
- }
- @Override
- protected String getPluralDescription() {
- return "адресаты";
- }
- @Override
protected boolean hasCheckBox() {
return true;
}
@@ -60,7 +52,7 @@ public class SubsribersForm extends DataSetControlForm {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
index 869349f6..24e13576 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
@@ -20,6 +20,14 @@ public class GroupsDBTable extends iDBTable {
}
//------------------------------------------------>>>
@Override
+ public String getSingleDescription() {
+ return "группа тестов";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "группы";
+ }
+ @Override
public LinkedHashMap, FKBehaviour> getFKDependencies() {
LinkedHashMap, FKBehaviour> res = new LinkedHashMap<>();
res.put(Test.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
index 3051018f..e8af6765 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
@@ -26,14 +26,6 @@ public class GroupsForm extends DataSetControlForm {
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 {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests) {
{
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
index d46ac1aa..32817b7c 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
@@ -13,6 +13,14 @@ public class TestDBTable extends iDBTable {
super(Test.class);
}
@Override
+ public String getSingleDescription() {
+ return "тест";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "тесты";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new TestsForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
index 0ba6b38a..2792c6a2 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
@@ -18,14 +18,6 @@ public class TestsForm extends DataSetControlForm {
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 {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription()) {
+ return new DataMenuBar(dataSource.getPluralDescription()) {
{
addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
index 24671cdf..884eebc9 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
@@ -11,6 +11,14 @@ public class DVMConfigurationDBTable extends iDBTable {
super(DVMConfiguration.class);
}
@Override
+ public String getSingleDescription() {
+ return "конфигурация";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "конфигурации";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMConfigurationsForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
index 52eb8508..e478cb7f 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
@@ -21,14 +21,6 @@ public class DVMConfigurationsForm extends DataSetControlForm
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
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 2ade2659..733ce11f 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -11,6 +11,14 @@ public class DVMPackageDBTable extends iDBTable {
super(DVMPackage.class);
}
@Override
+ public String getSingleDescription() {
+ return "пакет";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "пакеты";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMPackagesForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index d4660d51..d7cfb32b 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -27,14 +27,6 @@ public class DVMPackagesForm extends DataSetControlForm {
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 {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription()) {
+ return new DataMenuBar(dataSource.getPluralDescription()) {
{
addPasses(PassCode.SynchronizeTests);
addSeparator();
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
index 7bab9e84..43cecf56 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
@@ -11,6 +11,14 @@ public class DVMSettingsDBTable extends iDBTable {
super(DVMSettings.class);
}
@Override
+ public String getSingleDescription() {
+ return "параметры тестирования";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "параметры тестирования";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMSettingsForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
index 02422153..b86e32fc 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
@@ -18,14 +18,6 @@ public class DVMSettingsForm extends DataSetControlForm {
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 {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
index 8788fcdb..c17650c9 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
+++ b/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 {
- //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);
}
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
index 933d8b86..2d0897a0 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -23,14 +23,6 @@ public class DVMRunTasksForm extends DataSetControlForm {
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 {
}
@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() {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
index 4d0b49bd..d371e0b9 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
@@ -13,6 +13,14 @@ public class SapforConfigurationDBTable extends iDBTable {
super(SapforConfiguration.class);
}
@Override
+ public String getSingleDescription() {
+ return "конфигурация";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "конфигурации";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforConfigurationsForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
index af8c3669..98f34ad9 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
@@ -22,14 +22,6 @@ public class SapforConfigurationsForm extends DataSetControlForm {
super(SapforPackage.class);
}
@Override
+ public String getSingleDescription() {
+ return "пакет";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "пакеты";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforPackagesForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index b4965dd8..1fa72f95 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -27,14 +27,6 @@ public class SapforPackagesForm extends DataSetControlForm {
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 {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
+ return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeTests) {
{
addSeparator();
addPasses(PassCode.AbortSapforPackage);
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
index 947d873f..d6062eaf 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
@@ -17,6 +17,14 @@ public class SapforSettingsDBTable extends iDBTable {
super(SapforSettings.class);
}
@Override
+ public String getSingleDescription() {
+ return "параметры тестирования";
+ }
+ @Override
+ public String getPluralDescription() {
+ return "параметры тестирования";
+ }
+ @Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforSettingsForm(this, mountPanel);
}
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
index f6133e03..035d83dc 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
@@ -17,14 +17,6 @@ public class SapforSettingsForm extends DataSetControlForm {
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 {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.PublishSapforSettings,
PassCode.CloneSapforSettings,
PassCode.EditSapforSettings,
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
index 21e163f6..013d9266 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
@@ -13,6 +13,14 @@ public class SapforSettingsCommandsDBTable extends iDBTable {
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);
}
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
index 7880aa08..4848dab8 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
@@ -20,14 +20,6 @@ public class ServerSapforsForm extends DataSetControlForm {
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 {
}
@Override
public DataMenuBar createMenuBar() {
- return new DataMenuBar(getPluralDescription(),
+ return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr,