M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
02090095
2024-10-22 19:17:01 +03:00
parent 2edaffd634
commit 2fed433634
63 changed files with 339 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Common/Database/Tables/DataSet.java
View File

@@ -19,6 +19,13 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
k = k_in;
d = d_in;
}
//--
public String getPluralDescription() {
return "";
}
public String getSingleDescription() {
return "";
}
//---
protected DataSetControlForm createUI(JPanel mountPanel) {
return null;

18
src/Common/Visual/DataSetControlForm.java
View File

@@ -72,12 +72,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
}
}
protected String getPluralDescription() {
return "";
}
protected String getSingleDescription() {
return "";
}
<M> Vector<M> getFilters(Class<M> f) {
Vector<M> res = new Vector<>();
for (DBObjectFilter_ filter_ : allFilters) {
@@ -342,7 +336,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
filter.Mount(getControl());
}
protected DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription());
return new DataMenuBar(dataSource.getPluralDescription());
}
protected void createFilters() {
}
@@ -465,7 +459,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
public boolean CheckSelectedOrCurrent(TextLog log) {
if ((getSelectedCount() == 0) && (CurrentName() == null || (getCurrent() == null))) {
log.Writeln_(getPluralDescription() + ":");
log.Writeln_(dataSource.getPluralDescription() + ":");
log.Writeln_("Отсутствуют отмеченные объекты, или текущий объект!");
return false;
}
@@ -512,13 +506,13 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
//ДИАЛОГИ
public boolean ShowAddObjectDialog(D object) {
return getDialog().ShowDialog(getSingleDescription() + ": добавление", object);
return getDialog().ShowDialog(dataSource.getSingleDescription() + ": добавление", object);
}
public boolean ShowEditObjectDialog(D object) {
DBObjectDialog dialog = getDialog();
dialog.edit = true;
dialog.SetEditLimits();
String title = getSingleDescription() + ": ";
String title = dataSource.getSingleDescription() + ": ";
if (isObjectEditable(object)) {
title += "редактирование";
} else {
@@ -528,9 +522,9 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
return dialog.ShowDialog(title, object);
}
public boolean ShowDeleteObjectDialog(D object) {
return UI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
return UI.Warning(dataSource.getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
}
public boolean ShowDeleteObjectsDialog(int toDeleteCount) {
return UI.Warning(getPluralDescription() + " в количестве " + toDeleteCount + " будут удалены)");
return UI.Warning(dataSource.getPluralDescription() + " в количестве " + toDeleteCount + " будут удалены)");
}
}

8
src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -19,6 +19,14 @@ public class CompilersDBTable extends iDBTable<Compiler> {
super(Compiler.class);
}
@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(Makefile.class, new FKBehaviour(FKDataBehaviour.DROP, FKCurrentObjectBehaviuor.PASSIVE));

10
src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java
View File

@@ -19,14 +19,6 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
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<Compiler> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,

8
src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -11,6 +11,14 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
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);
}

10
src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java
View File

@@ -18,14 +18,6 @@ public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
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<DVMParameter> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddDVMParameter,
PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter);

8
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
View File

@@ -11,6 +11,14 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
super(EnvironmentValue.class);
}
@Override
public String getSingleDescription() {
return "переменная окружения";
}
@Override
public String getPluralDescription() {
return "переменные окружения";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new EnvironmentsValuesForm(this, mountPanel);
}

10
src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
View File

@@ -19,14 +19,6 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
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<EnvironmentValue>
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,

8
src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
View File

@@ -25,6 +25,14 @@ public class MachinesDBTable extends iDBTable<Machine> {
super(Machine.class);
}
@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<>();
//-

10
src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
View File

@@ -22,14 +22,6 @@ public class MachinesForm extends DataSetControlForm<Machine> {
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<Machine> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddMachine,
PassCode.EditMachine,
PassCode.DeleteMachine) {

8
src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
View File

@@ -18,6 +18,14 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
super(Makefile.class);
}
@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(Module.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

10
src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java
View File

@@ -20,14 +20,6 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
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<Makefile> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,

8
src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
View File

@@ -9,6 +9,14 @@ public class ModulesDBTable extends iDBTable<Module> {
super(Module.class);
}
@Override
public String getSingleDescription() {
return "языковой модуль";
}
@Override
public String getPluralDescription() {
return "языковые модули";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ModulesForm(this, mountPanel);
}

10
src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java
View File

@@ -19,14 +19,6 @@ public class ModulesForm extends DataSetControlForm<Module> {
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<Module> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.EditModule);
}
@Override
public boolean isObjectVisible(Module object) {

8
src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -19,6 +19,14 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
super(RunConfiguration.class);
}
@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(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

10
src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java
View File

@@ -18,14 +18,6 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
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<RunConfiguration>
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.Run,
PassCode.AddRunConfiguration,
PassCode.EditRunConfiguration,

8
src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -17,6 +17,14 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
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);
}

10
src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
View File

@@ -19,14 +19,6 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
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<SapforProfile> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveProfile,
PassCode.EditProfile,
PassCode.ApplyProfile,

8
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
View File

@@ -17,6 +17,14 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
super(CompilationTask.class);
}
@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(RunTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

10
src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
View File

@@ -20,14 +20,6 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
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<CompilationTask> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteCompilationTasks);
}
@Override
public boolean isObjectVisible(CompilationTask object) {

8
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -11,6 +11,14 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
super(RunTask.class);
}
@Override
public String getSingleDescription() {
return "задача на запуск";
}
@Override
public String getPluralDescription() {
return "задачи на запуск";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new RunTasksForm(this, mountPanel);
}

10
src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
View File

@@ -20,14 +20,6 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
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<RunTask> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteRunTasks);
}
@Override
public boolean isObjectVisible(RunTask object) {

10
src/_VisualDVM/GlobalData/User/UI/UsersForm.java
View File

@@ -20,14 +20,6 @@ public class UsersForm extends DataSetControlForm<User> {
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<User> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,

8
src/_VisualDVM/GlobalData/User/UsersDBTable.java
View File

@@ -18,6 +18,14 @@ public class UsersDBTable extends iDBTable<User> {
super(User.class);
}
@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(CompilationTask.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));

8
src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
View File

@@ -9,6 +9,14 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
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);
}

10
src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java
View File

@@ -15,14 +15,6 @@ public class DBArraysForm extends DataSetControlForm<DBArray> {
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<DBArray> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()) {
return new DataMenuBar(dataSource.getPluralDescription()) {
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.

8
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArraysSet.java
View File

@@ -9,6 +9,14 @@ public class ProjectArraysSet extends DataSet<Long, ProjectArray> {
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);
}

8
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
View File

@@ -29,14 +29,6 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
return Current.ProjectArray;
}
@Override
protected String getSingleDescription() {
return "массив";
}
@Override
protected String getPluralDescription() {
return "объявленные массивы";
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",

8
src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
View File

@@ -11,6 +11,14 @@ public class ParallelRegionsSet extends DataSet<BigInteger, ParallelRegion> {
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);
}

8
src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java
View File

@@ -16,14 +16,6 @@ public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
return Current.ParallelRegionInfo;
}
@Override
protected String getSingleDescription() {
return "область распараллеливания";
}
@Override
protected String getPluralDescription() {
return "области распараллеливания";
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",

4
src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariantsSet.java
View File

@@ -9,6 +9,10 @@ public class ParallelVariantsSet extends DataSet<String, ParallelVariant> {
super(String.class, ParallelVariant.class);
}
@Override
public String getPluralDescription() {
return "варианты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ParallelVariantsForm(this, mountPanel);
}

6
src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java
View File

@@ -19,10 +19,6 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
return Current.ParallelVariant;
}
@Override
protected String getPluralDescription() {
return "варианты";
}
@Override
protected boolean hasCheckBox() {
return true;
}
@@ -84,7 +80,7 @@ public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.ShowAllParallelVariants,
PassCode.ShowParallelVariantsCoverage,
PassCode.PredictParallelVariants,

8
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -13,6 +13,14 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
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);
}

10
src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
View File

@@ -35,14 +35,6 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
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<BugReport> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,

8
src/_VisualDVM/Repository/Component/ComponentsSet.java
View File

@@ -9,6 +9,14 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
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);
}

12
src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
View File

@@ -23,14 +23,6 @@ public class ComponentsForm extends DataSetControlForm<Component> {
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<Component> {
}
@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<Component> {
}
}
);
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
MainModule_.instance.getPass(PassCode.PublishComponent).setControlsVisible(false);
}
};
}

8
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
View File

@@ -10,6 +10,14 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
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) &&

10
src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
View File

@@ -17,14 +17,6 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
return Current.SubscriberWorkspace;
}
@Override
protected String getSingleDescription() {
return "рабочая папка";
}
@Override
protected String getPluralDescription() {
return "рабочие папки";
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"URL",
@@ -45,7 +37,7 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
}
@Override
public boolean isObjectVisible(SubscriberWorkspace object) {

8
src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
View File

@@ -17,6 +17,14 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
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);
}

10
src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
View File

@@ -20,14 +20,6 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
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<Subscriber> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,

8
src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -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));

10
src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
View File

@@ -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) {
{

8
src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
View File

@@ -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);
}

10
src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
View File

@@ -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);

8
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
View File

@@ -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);
}

10
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
View File

@@ -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,

8
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -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);
}

10
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -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();

8
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
View File

@@ -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);
}

10
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
View File

@@ -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,

9
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
View File

@@ -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);
}

10
src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
View File

@@ -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() {

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -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);
}

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
View File

@@ -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,

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -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);
}

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -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);

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
View File

@@ -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);
}

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
View File

@@ -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,

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
View File

@@ -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);
}

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
View File

@@ -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);

8
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -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);
}

10
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
View File

@@ -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,