рефакторинг создания меню баров для таблиц

This commit is contained in:
2024-10-14 20:57:18 +03:00
parent 84acf05c19
commit 7f1d21a067
104 changed files with 204 additions and 348 deletions

View File

@@ -145,4 +145,8 @@ public class GroupsDBTable extends iDBTable<Group> {
}
return null;
}
@Override
public Class getMenuBarClass() {
return GroupsMenuBar.class;
}
}

View File

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

View File

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

View File

@@ -1,13 +1,9 @@
package _VisualDVM.TestingSystem.Common.MachineProcess;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import _VisualDVM.Mode;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.*;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;

View File

@@ -124,4 +124,8 @@ public class TestDBTable extends iDBTable<Test> {
}
return selectedTests.isEmpty() ? allTests : selectedTests;
}
@Override
public Class getMenuBarClass() {
return TestsMenuBar.class;
}
}

View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import Common.Visual.Menus.VisualiserMenu;
public class AddTestMenu extends VisualiserMenu {
public AddTestMenu() {
super("Добавление теста", "/icons/RedAdd.png", false);

View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import Common.Visual.Menus.VisualiserMenu;
public class EditTestMenu extends VisualiserMenu {
public EditTestMenu() {
super("Редактирование теста", "/icons/Edit.png", false);

View File

@@ -3,10 +3,10 @@ import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import Common.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
import java.awt.*;

View File

@@ -114,4 +114,8 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
public boolean ShowEditObjectDialog(DBObject object) {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public Class getMenuBarClass() {
return DVMConfigurationsMenuBar.class;
}
}

View File

@@ -122,4 +122,8 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return DVMPackagesBar.class;
}
}

View File

@@ -5,6 +5,7 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
public DVMSettingsDBTable() {
@@ -144,4 +145,8 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
public boolean ShowEditObjectDialog(DBObject object) {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public Class getMenuBarClass() {
return DVMSettingsBar.class;
}
}

View File

@@ -162,4 +162,8 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return DVMRunTasksBar.class;
}
}

View File

@@ -127,4 +127,8 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
return sapforConfiguration;
return null;
}
@Override
public Class getMenuBarClass() {
return SapforConfigurationsMenuBar.class;
}
}

View File

@@ -6,6 +6,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar;
import java.util.Comparator;
import java.util.Date;
@@ -100,4 +101,8 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return SapforPackagesBar.class;
}
}

View File

@@ -115,4 +115,8 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
res.put(SapforSettingsCommand.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
@Override
public Class getMenuBarClass() {
return SapforSettingsBar.class;
}
}

View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
import Common.MainModule_;
import Common.Visual.Tables.StyledCellLabel;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;

View File

@@ -81,4 +81,8 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
}
return res;
}
@Override
public Class getMenuBarClass() {
return SapforSettingsCommandsBar.class;
}
}

View File

@@ -1,10 +1,7 @@
package _VisualDVM.TestingSystem.SAPFOR;
import Common.CommonConstants;
import _VisualDVM.Mode;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.*;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.EmailMessage;
@@ -17,7 +14,6 @@ import _VisualDVM.TestingSystem.SAPFOR.Json.SapforTestingSet_json;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import _VisualDVM.Utils;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;

View File

@@ -71,4 +71,8 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return ServerSapforsBar.class;
}
}