продолжение рефакторинга таблиц. перевод меню баров в интерфейс

This commit is contained in:
2024-10-17 21:24:55 +03:00
parent debc1a6cae
commit 452c023f1d
45 changed files with 515 additions and 510 deletions

View File

@@ -30,7 +30,7 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
@@ -67,6 +67,19 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
}
});
}
@Override
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);
}
};
}
@Override
@@ -115,19 +128,6 @@ 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 DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
PassCode.PublishBugReport,
PassCode.OpenBugReportTestProject,
PassCode.OpenBugReport,
PassCode.UpdateBugReportProgress,
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteBugReport;
}

View File

@@ -27,7 +27,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -39,6 +39,27 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
columns.get(4).setRendererClass(RendererMaskedNanInteger.class);
columns.get(6).setRendererClass(RendererStatusEnum.class);
}
@Override
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);
}
};
}
};
}
@Override
@@ -91,25 +112,4 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
target.add(server);
return target;
}
@Override
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);
}
};
}
}

View File

@@ -37,7 +37,12 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel);
return new DataSetControlForm(this, mountPanel) {
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
}
};
}
@Override
public Object getFieldAt(SubscriberWorkspace object, int columnIndex) {
@@ -52,10 +57,6 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
return null;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteSubscriberWorkspace;
}

View File

@@ -32,7 +32,7 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -45,6 +45,15 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
columns.get(3).setVisible(admin);
columns.get(4).setVisible(admin);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
};
}
@Override
@@ -79,15 +88,6 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
return res;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteSubscriber;
}