no message

This commit is contained in:
2024-10-14 15:19:13 +03:00
parent 8eef367bd4
commit 5e09fb44ea
634 changed files with 3751 additions and 3263 deletions

View File

@@ -1,16 +1,15 @@
package _VisualDVM.TestingSystem.Common.Group;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap;
@@ -20,35 +19,11 @@ public class Group extends riDBObject {
public TestType type = TestType.Default;
@Description("DEFAULT 'fortran'")
public LanguageName language = LanguageName.fortran;
//--
@Override
public boolean isVisible() {
return (!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(sender_address)) &&
Global.testingServer.db.groups.applyFilters(this);
}
public String getSummary() {
return description + " " + language.getDescription();
}
//-
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
Group g = (Group) src;
type = g.type;
language = g.language;
}
public Group(Group group) {
this.SynchronizeFields(group);
}
public Group() {
}
@Override
public void select(boolean flag) {
super.select(flag);
if (UI_.isActive())
UI.getMainWindow().ShowCheckedTestsCount();
}
//--
//-
public static void generateForLanguage(
@@ -94,6 +69,29 @@ public class Group extends riDBObject {
bodies.add(module_body);
}
}
//--
@Override
public boolean isVisible() {
return (!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(sender_address)) &&
Global.testingServer.db.groups.applyFilters(this);
}
public String getSummary() {
return description + " " + language.getDescription();
}
//-
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
Group g = (Group) src;
type = g.type;
language = g.language;
}
@Override
public void select(boolean flag) {
super.select(flag);
if (UI_.isActive())
UI.getMainWindow().ShowCheckedTestsCount();
}
public String GenerateMakefile(Test test, String dvm_drv, String flags_in) {
//----->>
LinkedHashMap<LanguageName, Vector<ProjectFile>> programs = test.getPrograms();

View File

@@ -1,15 +1,15 @@
package _VisualDVM.TestingSystem.Common.Group;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import Common.Visual.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.DataSetControlForm;
import Common.Visual.DataSetFilter;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.UI.GroupFields;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -51,7 +51,6 @@ public class GroupsDBTable extends iDBTable<Group> {
}
});
}
@Override
public String getSingleDescription() {
return "группа тестов";
@@ -138,10 +137,10 @@ public class GroupsDBTable extends iDBTable<Group> {
}
return false;
}
public Group getGroupByDescription(LanguageName language_in,String description_in) {
public Group getGroupByDescription(LanguageName language_in, String description_in) {
for (Group group : Data.values()) {
if (group.sender_address.equals("vmk-post@yandex.ru")&&
group.language.equals(language_in)&&group.description.equalsIgnoreCase(description_in))
if (group.sender_address.equals("vmk-post@yandex.ru") &&
group.language.equals(language_in) && group.description.equalsIgnoreCase(description_in))
return group;
}
return null;

View File

@@ -1,11 +1,11 @@
package _VisualDVM.TestingSystem.Common.Group;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Group.UI.AddGroupMenu;
import _VisualDVM.TestingSystem.Common.Group.UI.EditGroupMenu;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class GroupsMenuBar extends DataMenuBar {
@@ -13,7 +13,7 @@ public class GroupsMenuBar extends DataMenuBar {
super("группы",
PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests
);
);
addMenus(new AddGroupMenu(), new EditGroupMenu());
addPasses(PassCode.DeleteGroup);
add(new JSeparator());

View File

@@ -1,6 +1,6 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenu;
public class AddGroupMenu extends VisualiserMenu {
public AddGroupMenu() {
super("", "/icons/RedAdd.png");

View File

@@ -1,9 +1,9 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenu;
public class EditGroupMenu extends VisualiserMenu {
public EditGroupMenu() {
super("", "/icons/Edit.png" );
super("", "/icons/Edit.png");
addPasses(PassCode.EditGroup, PassCode.ReplaceTestsFromFiles);
}
}