окончательное разделение таблицы и функционала видимой ее формы

This commit is contained in:
2024-10-22 15:25:06 +03:00
parent 319e6575c8
commit 38b2896e4a
102 changed files with 738 additions and 709 deletions

View File

@@ -8,7 +8,6 @@ import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.UI.GroupFields;
@@ -25,14 +24,6 @@ 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));
@@ -43,10 +34,6 @@ public class GroupsDBTable extends iDBTable<Group> {
return new GroupsForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.Group;
}
@Override
public DBObjectDialog<Group, GroupFields> getDialog() {
return new DBObjectDialog<Group, GroupFields>(GroupFields.class) {
@Override

View File

@@ -7,6 +7,7 @@ import Common.Visual.DataSetFiltersMenu;
import Common.Visual.FilterFlag;
import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName;
@@ -20,6 +21,18 @@ public class GroupsForm extends DataSetControlForm<Group> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.Group;
}
@Override
public String getSingleDescription() {
return "группа тестов";
}
@Override
public String getPluralDescription() {
return "группы";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -49,7 +62,7 @@ public class GroupsForm extends DataSetControlForm<Group> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests) {
{

View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Group.Group;
@@ -17,22 +16,10 @@ 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);
}
@Override
public Current CurrentName() {
return Current.Test;
}
@Override
public DBObjectDialog<Test, TestFields> getDialog() {
return new DBObjectDialog<Test, TestFields>(TestFields.class) {
@Override

View File

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

View File

@@ -310,9 +310,9 @@ public class TestsDatabase extends SQLiteDatabase {
return false;
}
public void UnselectAllGTC() {
groups.SelectAll(false);
tests.SelectAll(false);
dvm_configurations.SelectAll(false);
groups.getUI().SelectAll(false);
tests.getUI().SelectAll(false);
dvm_configurations.getUI().SelectAll(false);
}
public void CheckTestsPackagesDependencies(Vector<Integer> testsIds, TextLog Log) {
//определить есть ли активные пакеты в которые входят упомянутые тесты