промежуточный. частичный рефакторинг с прицелом на библиотечную часть
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
package TestingSystem.Common.Group;
|
||||
import Common.Current;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Database.riDBObject;
|
||||
import Common.Global;
|
||||
import Common.UI.UI;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Current;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Objects.riDBObject;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.UI;
|
||||
import Common_old.Utils.Utils;
|
||||
import ProjectData.Files.ProjectFile;
|
||||
import ProjectData.LanguageName;
|
||||
import TestingSystem.Common.Test.Test;
|
||||
|
||||
@@ -1,9 +1,15 @@
|
||||
package TestingSystem.Common.Group;
|
||||
import Common.Current;
|
||||
import Common.Database.*;
|
||||
import Common.UI.DataSetControlForm;
|
||||
import Common.UI.UI;
|
||||
import Common.UI.Windows.Dialog.DBObjectDialog;
|
||||
import Common_old.Current;
|
||||
import Common_old.UI.DataSetControlForm;
|
||||
import Common_old.UI.UI;
|
||||
import Common_old.UI.Windows.Dialog.DBObjectDialog;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Tables.FKBehaviour;
|
||||
import Common.Database.Tables.FKCurrentObjectBehaviuor;
|
||||
import Common.Database.Tables.FKDataBehaviour;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import Common.Visual.DBObjectFilter;
|
||||
import Common.Visual.DataSetFilter;
|
||||
import ProjectData.LanguageName;
|
||||
import TestingSystem.Common.Group.UI.GroupFields;
|
||||
import TestingSystem.Common.Test.Test;
|
||||
@@ -19,11 +25,11 @@ public class GroupsDBTable extends iDBTable<Group> {
|
||||
//------------------------------------------------>>>
|
||||
@Override
|
||||
protected void createFilters() {
|
||||
filters.add(new DataSetFilter<Group>("Тип", this) {
|
||||
filters.add(new Common.Visual.DataSetFilter<Group>("Тип", this) {
|
||||
@Override
|
||||
public void fill() {
|
||||
for (TestType type : TestType.values())
|
||||
field_filters.add(new DBObjectFilter<Group>(dataSet, type.getDescription()) {
|
||||
field_filters.add(new Common.Visual.DBObjectFilter<Group>(dataSet, type.getDescription()) {
|
||||
@Override
|
||||
protected boolean validate(Group object) {
|
||||
return object.type.equals(type);
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
package TestingSystem.Common.Group;
|
||||
import Common.Global;
|
||||
import Common.UI.Menus_2023.DataMenuBar;
|
||||
import Common.UI.Menus_2023.MenuBarButton;
|
||||
import Common.Utils.Utils;
|
||||
import TestingSystem.Common.Group.GroupsDBTable;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Menus_2023.DataMenuBar;
|
||||
import Common_old.UI.Menus_2023.MenuBarButton;
|
||||
import Common_old.Utils.Utils;
|
||||
import TestingSystem.Common.Group.UI.AddGroupMenu;
|
||||
import TestingSystem.Common.Group.UI.EditGroupMenu;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
package TestingSystem.Common.Group.Json;
|
||||
import Common.Utils.Utils;
|
||||
import TestingSystem.Common.Group.Group;
|
||||
import com.google.gson.annotations.Expose;
|
||||
public class GroupJson {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package TestingSystem.Common.Group.UI;
|
||||
import Common.UI.Menus_2023.VisualiserMenu;
|
||||
import Common_old.UI.Menus_2023.VisualiserMenu;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
public class AddGroupMenu extends VisualiserMenu {
|
||||
public AddGroupMenu() {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package TestingSystem.Common.Group.UI;
|
||||
import Common.UI.Menus_2023.VisualiserMenu;
|
||||
import Common_old.UI.Menus_2023.VisualiserMenu;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
public class EditGroupMenu extends VisualiserMenu {
|
||||
public EditGroupMenu() {
|
||||
super("", "/icons/Edit.png" );
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package TestingSystem.Common.Group.UI;
|
||||
import Common.UI.TextField.StyledTextField;
|
||||
import Common.UI.Windows.Dialog.DialogFields;
|
||||
import Common_old.UI.TextField.StyledTextField;
|
||||
import Common_old.UI.Windows.Dialog.DialogFields;
|
||||
import ProjectData.LanguageName;
|
||||
import TestingSystem.Common.Test.TestType;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user