вывод диалоговых форм для объектов в отдельный класс
This commit is contained in:
@@ -6,14 +6,10 @@ import Common.Database.Tables.FKDataBehaviour;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import Common.Passes.PassCode_;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.UI;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.ProjectData.LanguageName;
|
||||
import _VisualDVM.TestingSystem.Common.Group.UI.GroupFields;
|
||||
import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
|
||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||
import _VisualDVM.TestingSystem.Common.Test.TestType;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.LinkedHashMap;
|
||||
@@ -33,34 +29,6 @@ public class GroupsDBTable extends iDBTable<Group> {
|
||||
protected DataSetControlForm createUI(JPanel mountPanel) {
|
||||
return new GroupsForm(this, mountPanel);
|
||||
}
|
||||
@Override
|
||||
public DBObjectDialog<Group, GroupFields> getDialog() {
|
||||
return new DBObjectDialog<Group, GroupFields>(GroupFields.class) {
|
||||
@Override
|
||||
public int getDefaultHeight() {
|
||||
return 250;
|
||||
}
|
||||
@Override
|
||||
public int getDefaultWidth() {
|
||||
return 400;
|
||||
}
|
||||
@Override
|
||||
public void validateFields() {
|
||||
}
|
||||
@Override
|
||||
public void fillFields() {
|
||||
fields.tfName.setText(Result.description);
|
||||
UI.TrySelect(fields.cbType, Result.type);
|
||||
UI.TrySelect(fields.cbLanguage, Result.language);
|
||||
}
|
||||
@Override
|
||||
public void ProcessResult() {
|
||||
Result.description = fields.tfName.getText();
|
||||
Result.type = (TestType) fields.cbType.getSelectedItem();
|
||||
Result.language = (LanguageName) fields.cbLanguage.getSelectedItem();
|
||||
}
|
||||
};
|
||||
}
|
||||
public boolean containsGroupWithDescription(String description_in) {
|
||||
for (Group group : Data.values()) {
|
||||
if (group.description.equalsIgnoreCase(description_in))
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package _VisualDVM.TestingSystem.Common.Group.UI;
|
||||
import Common.Visual.UI;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.ProjectData.LanguageName;
|
||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||
import _VisualDVM.TestingSystem.Common.Test.TestType;
|
||||
public class GroupDialog extends DBObjectDialog<Group, GroupFields> {
|
||||
public GroupDialog() {
|
||||
super(GroupFields.class);
|
||||
}
|
||||
@Override
|
||||
public int getDefaultHeight() {
|
||||
return 250;
|
||||
}
|
||||
@Override
|
||||
public int getDefaultWidth() {
|
||||
return 400;
|
||||
}
|
||||
@Override
|
||||
public void validateFields() {
|
||||
}
|
||||
@Override
|
||||
public void fillFields() {
|
||||
fields.tfName.setText(Result.description);
|
||||
UI.TrySelect(fields.cbType, Result.type);
|
||||
UI.TrySelect(fields.cbLanguage, Result.language);
|
||||
}
|
||||
@Override
|
||||
public void ProcessResult() {
|
||||
Result.description = fields.tfName.getText();
|
||||
Result.type = (TestType) fields.cbType.getSelectedItem();
|
||||
Result.language = (LanguageName) fields.cbLanguage.getSelectedItem();
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import Common.Visual.DataSetFiltersMenu;
|
||||
import Common.Visual.FilterFlag;
|
||||
import Common.Visual.FilterMenuFlag;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
@@ -110,4 +111,8 @@ public class GroupsForm extends DataSetControlForm<Group> {
|
||||
}
|
||||
});
|
||||
}
|
||||
@Override
|
||||
public DBObjectDialog getDialog() {
|
||||
return new GroupDialog();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,11 +2,8 @@ package _VisualDVM.TestingSystem.Common.Test;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import Common.Passes.PassCode_;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||
import _VisualDVM.TestingSystem.Common.Test.UI.TestFields;
|
||||
import _VisualDVM.TestingSystem.Common.Test.UI.TestsForm;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -19,42 +16,6 @@ public class TestDBTable extends iDBTable<Test> {
|
||||
protected DataSetControlForm createUI(JPanel mountPanel) {
|
||||
return new TestsForm(this, mountPanel);
|
||||
}
|
||||
@Override
|
||||
public DBObjectDialog<Test, TestFields> getDialog() {
|
||||
return new DBObjectDialog<Test, TestFields>(TestFields.class) {
|
||||
@Override
|
||||
public int getDefaultHeight() {
|
||||
return 200;
|
||||
}
|
||||
@Override
|
||||
public int getDefaultWidth() {
|
||||
return 400;
|
||||
}
|
||||
@Override
|
||||
public void validateFields() {
|
||||
if (!edit) {
|
||||
if (!Global.mainModule.getGroup().language.equals(Global.mainModule.getProject().languageName))
|
||||
Log.Writeln_("В текущую группу могут войти только тесты на языке " + Global.mainModule.getGroup().language);
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void fillFields() {
|
||||
fields.tfName.setText(Result.description);
|
||||
fields.sMinDim.setValue(Result.min_dim);
|
||||
fields.sMaxDim.setValue(Result.max_dim);
|
||||
}
|
||||
@Override
|
||||
public void ProcessResult() {
|
||||
Result.description = fields.tfName.getText();
|
||||
Result.min_dim = (int) fields.sMinDim.getValue();
|
||||
Result.max_dim = (int) fields.sMaxDim.getValue();
|
||||
if (!edit) {
|
||||
Result.sender_name = Global.mainModule.getAccount().name;
|
||||
Result.sender_address = Global.mainModule.getAccount().email;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
public boolean containsTestWithDescription(String description_in) {
|
||||
for (Test test : Data.values()) {
|
||||
if (test.description.equalsIgnoreCase(description_in))
|
||||
|
||||
40
src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
Normal file
40
src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
Normal file
@@ -0,0 +1,40 @@
|
||||
package _VisualDVM.TestingSystem.Common.Test.UI;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||
public class TestDialog extends DBObjectDialog<Test, TestFields> {
|
||||
public TestDialog() {
|
||||
super(TestFields.class);
|
||||
}
|
||||
@Override
|
||||
public int getDefaultHeight() {
|
||||
return 200;
|
||||
}
|
||||
@Override
|
||||
public int getDefaultWidth() {
|
||||
return 400;
|
||||
}
|
||||
@Override
|
||||
public void validateFields() {
|
||||
if (!edit) {
|
||||
if (!Global.mainModule.getGroup().language.equals(Global.mainModule.getProject().languageName))
|
||||
Log.Writeln_("В текущую группу могут войти только тесты на языке " + Global.mainModule.getGroup().language);
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void fillFields() {
|
||||
fields.tfName.setText(Result.description);
|
||||
fields.sMinDim.setValue(Result.min_dim);
|
||||
fields.sMaxDim.setValue(Result.max_dim);
|
||||
}
|
||||
@Override
|
||||
public void ProcessResult() {
|
||||
Result.description = fields.tfName.getText();
|
||||
Result.min_dim = (int) fields.sMinDim.getValue();
|
||||
Result.max_dim = (int) fields.sMaxDim.getValue();
|
||||
if (!edit) {
|
||||
Result.sender_name = Global.mainModule.getAccount().name;
|
||||
Result.sender_address = Global.mainModule.getAccount().email;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
|
||||
import Common.MainModule_;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||
@@ -68,5 +69,9 @@ public class TestsForm extends DataSetControlForm<Test> {
|
||||
public boolean isObjectVisible(Test object) {
|
||||
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.Group, object.group_id);
|
||||
}
|
||||
@Override
|
||||
public DBObjectDialog getDialog() {
|
||||
return new TestDialog();
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user