M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

рефакторинг верхних меню таблиц.

Browse Source
This commit is contained in:
02090095
2024-10-16 20:45:59 +03:00
parent 307b83f8c9
commit 5503751e07
65 changed files with 468 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
View File

@@ -2,10 +2,12 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
@@ -19,11 +21,11 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
}
@Override
public String getSingleDescription() {
return "конфигурация тестирования DVM системы";
return "конфигурация";
}
@Override
public String getPluralDescription() {
return "конфигурации тестирования DVM системы";
return "конфигурации";
}
@Override
protected DataSetControlForm createUI() {
@@ -115,7 +117,13 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public Class getMenuBarClass() {
return DVMConfigurationsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations );
}
}

16
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
View File

@@ -1,16 +0,0 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class DVMConfigurationsMenuBar extends DataMenuBar {
public DVMConfigurationsMenuBar() {
super("конфигурации");
addPasses(
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations
);
}
}

53
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -1,6 +1,9 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
@@ -11,6 +14,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import javax.swing.*;
import java.util.Comparator;
import java.util.Date;
public class DVMPackageDBTable extends iDBTable<DVMPackage> {
@@ -25,11 +29,11 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
}
@Override
public String getSingleDescription() {
return "пакет задач DVM";
return "пакет";
}
@Override
public String getPluralDescription() {
return "пакеты задач DVM";
return "пакеты";
}
@Override
protected DataSetControlForm createUI() {
@@ -123,7 +127,48 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return DVMPackagesBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()){
{
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode.AbortDVMPackage);
addSeparator();
addPasses(PassCode.DownloadDVMPackage,
PassCode.ExportDVMPackageToExcel,
PassCode.DeleteDVMPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
}

51
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -1,51 +0,0 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class DVMPackagesBar extends DataMenuBar {
public DVMPackagesBar() {
super("пакеты задач DVM");
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode.AbortDVMPackage);
addSeparator();
addPasses(PassCode.DownloadDVMPackage,
PassCode.ExportDVMPackageToExcel,
PassCode.DeleteDVMPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterMyOnly = !DVMPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
}

15
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
View File

@@ -2,10 +2,11 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
public DVMSettingsDBTable() {
@@ -17,11 +18,11 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
}
@Override
public String getSingleDescription() {
return "параметры тестирования DVM системы";
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
return "параметры тестирования DVM системы";
return "параметры тестирования";
}
//--
@Override
@@ -146,7 +147,11 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public Class getMenuBarClass() {
return DVMSettingsBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings);
}
}

13
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java
View File

@@ -1,13 +0,0 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class DVMSettingsBar extends DataMenuBar {
public DVMSettingsBar() {
super("параметры тестированя",
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings
);
}
}

9
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java
View File

@@ -1,9 +0,0 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class DVMRunTasksBar extends DataMenuBar {
public DVMRunTasksBar() {
super("задачи",
PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
}

6
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
View File

@@ -3,10 +3,12 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import java.util.Comparator;
@@ -162,7 +164,7 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public Class getMenuBarClass() {
return DVMRunTasksBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
}