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

14
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.Repository.BugReport;
import Common.Database.Tables.DBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
@@ -113,7 +114,16 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
return Data.values().stream().filter(bugReport -> bugReport.state.equals(BugReportState.draft)).collect(Collectors.toCollection(Vector::new));
}
@Override
public Class getMenuBarClass() {
return BugReportsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
PassCode.PublishBugReport,
PassCode.OpenBugReportTestProject,
PassCode.OpenBugReport,
PassCode.UpdateBugReportProgress,
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
}

17
src/_VisualDVM/Repository/BugReport/BugReportsMenuBar.java
View File

@@ -1,17 +0,0 @@
package _VisualDVM.Repository.BugReport;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class BugReportsMenuBar extends DataMenuBar {
public BugReportsMenuBar() {
super("отчёты об ошибках",
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
PassCode.PublishBugReport,
PassCode.OpenBugReportTestProject,
PassCode.OpenBugReport,
PassCode.UpdateBugReportProgress,
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
}

28
src/_VisualDVM/Repository/Component/ComponentsSet.java
View File

@@ -1,10 +1,15 @@
package _VisualDVM.Repository.Component;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.ComponentsMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import java.util.Vector;
public class ComponentsSet extends DataSet<ComponentType, Component> {
@@ -86,7 +91,24 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
return target;
}
@Override
public Class getMenuBarClass() {
return ComponentsMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog){
{
addMenus(
new VisualiserMenu(
"Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
{
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
}
}
);
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
}
};
}
}

6
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
View File

@@ -1,7 +1,9 @@
package _VisualDVM.Repository.SubscriberWorkspace;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
public SubscriberWorkspaceDBTable() {
super(SubscriberWorkspace.class);
@@ -47,7 +49,7 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
return null;
}
@Override
public Class getMenuBarClass() {
return SubscriberWorkspacesMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
}
}

8
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
View File

@@ -1,8 +0,0 @@
package _VisualDVM.Repository.SubscriberWorkspace;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class SubscriberWorkspacesMenuBar extends DataMenuBar {
public SubscriberWorkspacesMenuBar() {
super("рабочие пространства", PassCode.DeleteSubscriberWorkspace);
}
}

13
src/_VisualDVM/Repository/Subscribes/SubscribersMenuBar.java
View File

@@ -1,13 +0,0 @@
package _VisualDVM.Repository.Subscribes;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class SubscribersMenuBar extends DataMenuBar {
public SubscribersMenuBar() {
super("Адресаты",
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
}

17
src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
View File

@@ -5,10 +5,12 @@ import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;
import _VisualDVM.Repository.Subscribes.UI.SubscriberForm;
@@ -20,7 +22,11 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
}
@Override
public String getSingleDescription() {
return "Адресат";
return "адресат";
}
@Override
public String getPluralDescription() {
return "адресаты";
}
@Override
protected DataSetControlForm createUI() {
@@ -71,7 +77,12 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
return res;
}
@Override
public Class getMenuBarClass() {
return SubscribersMenuBar.class;
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
}