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

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

@@ -121,7 +121,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
@@ -140,6 +140,14 @@ public class CompilersDBTable extends iDBTable<Compiler> {
public boolean hasCheckBox() {
return true;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,
PassCode.ShowCompilerHelp);
}
};
}
@Override
@@ -165,14 +173,6 @@ public class CompilersDBTable extends iDBTable<Compiler> {
return Current.Compiler;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,
PassCode.ShowCompilerHelp);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteCompiler;
}

View File

@@ -29,7 +29,7 @@ public class CompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;

View File

@@ -31,7 +31,7 @@ public class CompilerOptionsSet extends DataSet<String, CompilerOption> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;

View File

@@ -45,11 +45,18 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddDVMParameter,
PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter);
}
};
}
@Override
@@ -101,13 +108,6 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
};
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddDVMParameter,
PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteDVMParameter;
}

View File

@@ -70,11 +70,19 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,
PassCode.PickCompilerEnvironments);
}
};
}
@Override
@@ -101,14 +109,6 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
return null;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,
PassCode.PickCompilerEnvironments);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteEnvironmentValue;
}

View File

@@ -10,7 +10,7 @@ public class DirInfosDataSet extends DataSet<String, DirInfo> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRendererClass(RendererDate.class);

View File

@@ -90,7 +90,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
@@ -111,6 +111,28 @@ public class MachinesDBTable extends iDBTable<Machine> {
public boolean hasCheckBox() {
return true;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddMachine,
PassCode.EditMachine,
PassCode.DeleteMachine) {
{
add(new MenuBarButton() {
{
setIcon("/Common/icons/SilverArrowUp.png");
setToolTipText("Свернуть");
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
}
});
}
}, 0);
}
};
}
};
}
@Override
@@ -134,28 +156,6 @@ public class MachinesDBTable extends iDBTable<Machine> {
return Data.values().stream().anyMatch(machine -> machine.type.equals(MachineType.Local));
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddMachine,
PassCode.EditMachine,
PassCode.DeleteMachine) {
{
add(new MenuBarButton() {
{
setIcon("/Common/icons/SilverArrowUp.png");
setToolTipText("Свернуть");
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true);
}
});
}
}, 0);
}
};
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteMachine;
}

View File

@@ -42,7 +42,7 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
@@ -51,6 +51,19 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
public boolean hasCheckBox() {
return true;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,
PassCode.DeleteMakefile) {
{
addSeparator();
addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
}
};
}
};
}
@Override
@@ -79,18 +92,6 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
return Current.Makefile;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,
PassCode.DeleteMakefile) {
{
addSeparator();
addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
}
};
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteMakefile;
}

View File

@@ -27,7 +27,7 @@ public class ModulesDBTable extends iDBTable<Module> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -36,6 +36,10 @@ public class ModulesDBTable extends iDBTable<Module> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
}
};
}
@Override
@@ -66,8 +70,4 @@ public class ModulesDBTable extends iDBTable<Module> {
public Current CurrentName() {
return Current.Module;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.EditModule);
}
}

View File

@@ -16,7 +16,7 @@ public class RemoteFileChooserFields implements DialogFields {
private JButton bBack;
private JButton bHome;
public RemoteFileChooserFields() {
treeForm = new TreeForm(RemoteFilesTree.class,TreePanel);
treeForm = new TreeForm(RemoteFilesTree.class, TreePanel);
bBack.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -32,7 +32,6 @@ public class RemoteFileChooserFields implements DialogFields {
}
private void createUIComponents() {
// TODO: place custom component creation code here
}
@Override
public Component getContent() {

View File

@@ -119,11 +119,24 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.Run,
PassCode.AddRunConfiguration,
PassCode.EditRunConfiguration,
PassCode.DeleteRunConfiguration) {
{
add(new JSeparator());
addPasses(PassCode.EditProjectRunMaxtime);
}
};
}
};
}
@Override
@@ -170,19 +183,6 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
}
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.Run,
PassCode.AddRunConfiguration,
PassCode.EditRunConfiguration,
PassCode.DeleteRunConfiguration) {
{
add(new JSeparator());
addPasses(PassCode.EditProjectRunMaxtime);
}
};
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteRunConfiguration;
}

View File

@@ -30,11 +30,19 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveProfile,
PassCode.EditProfile,
PassCode.ApplyProfile,
PassCode.DeleteProfile);
}
};
}
@Override
@@ -83,14 +91,6 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
return res;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveProfile,
PassCode.EditProfile,
PassCode.ApplyProfile,
PassCode.DeleteProfile);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteProfile;
}

View File

@@ -9,16 +9,16 @@ public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting>
super(SapforProfileSetting.class);
}
@Override
public boolean hasMenuBar() {
return false;
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public boolean hasMenuBar() {
return false;
}
};
}
@Override

View File

@@ -36,7 +36,7 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -56,6 +56,10 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
}
};
}
@Override
@@ -114,10 +118,6 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
return Current.CompilationTask;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteCompilationTasks);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteCompilationTasks;
}

View File

@@ -24,7 +24,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -44,6 +44,10 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().ShowNoCurrentRunTask();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
}
};
}
@Override
@@ -80,10 +84,6 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
return Current.RunTask;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.DeleteRunTasks);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteRunTasks;
}

View File

@@ -75,7 +75,7 @@ public class UsersDBTable extends iDBTable<User> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
@@ -97,6 +97,14 @@ public class UsersDBTable extends iDBTable<User> {
public boolean hasCheckBox() {
return true;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,
PassCode.DeleteUser);
}
};
}
@Override
@@ -119,14 +127,6 @@ public class UsersDBTable extends iDBTable<User> {
return Current.User;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,
PassCode.DeleteUser);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteUser;
}

View File

@@ -20,7 +20,7 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -29,6 +29,15 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
protected void AdditionalInitColumns() {
columns.get(1).setEditable(false);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()) {
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.
}
};
}
};
}
@Override
@@ -50,13 +59,4 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
public Current CurrentName() {
return Current.DBArray;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()) {
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.
}
};
}
}

View File

@@ -20,7 +20,7 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
DataSet dataset = this;
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
@@ -54,6 +54,10 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
// sorter.setSortKeys(sortKeys);
// sorter.sort();
}
@Override
public boolean hasMenuBar() {
return false;
}
};
}
@Override
@@ -77,8 +81,4 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
public Comparator<M> getComparator() {
return Comparator.comparingInt(o -> o.line);
}
@Override
public boolean hasMenuBar() {
return false;
}
}

View File

@@ -16,20 +16,20 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(1).setMinWidth(700);
columns.get(1).setRendererClass(RendererWrapText.class);
}
@Override
public boolean hasMenuBar() {
return false;
}
};
}
@Override
public boolean hasMenuBar() {
return false;
}
@Override
public String[] getUIColumnNames() {
return new String[]{"текст"};
}

View File

@@ -29,7 +29,7 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;

View File

@@ -3,17 +3,15 @@ import Common.MainModule_;
import Common.Visual.ControlForm;
import Common.Visual.Tables.Grid.GridAnchestor;
import Common.Visual.Tables.StyledTable;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import javax.swing.*;
import java.awt.*;
import java.util.Vector;
public class DimensionsTableForm extends ControlForm<StyledTable> {
public DimensionsTableForm(JPanel mountPanel_in) {
super(StyledTable.class,mountPanel_in);
super(StyledTable.class, mountPanel_in);
}
@Override
protected void createControl() {

View File

@@ -26,7 +26,7 @@ public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);

View File

@@ -20,7 +20,7 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -34,6 +34,14 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
columns.get(columns.size() - 3).setRendererClass(RendererVariantRank.class);
columns.get(columns.size() - 2).setRendererClass(RendererDate.class);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.ShowAllParallelVariants,
PassCode.ShowParallelVariantsCoverage,
PassCode.PredictParallelVariants,
PassCode.CreateParallelVariants);
}
};
}
@Override
@@ -76,12 +84,4 @@ public class VariantsSet extends DataSet<String, ParallelVariant> {
public Current CurrentName() {
return Current.ParallelVariant;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.ShowAllParallelVariants,
PassCode.ShowParallelVariantsCoverage,
PassCode.PredictParallelVariants,
PassCode.CreateParallelVariants);
}
}

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;
}

View File

@@ -76,11 +76,38 @@ public class GroupsDBTable extends iDBTable<Group> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests) {
{
addMenus(new AddGroupMenu(), new EditGroupMenu());
addPasses(PassCode.DeleteGroup);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только группы тестов авторства пользователя");
Mark();
addActionListener(e -> {
GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
Mark();
Global.testingServer.db.groups.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
};
}
@Override
@@ -155,33 +182,6 @@ public class GroupsDBTable extends iDBTable<Group> {
return null;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests) {
{
addMenus(new AddGroupMenu(), new EditGroupMenu());
addPasses(PassCode.DeleteGroup);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только группы тестов авторства пользователя");
Mark();
addActionListener(e -> {
GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
Mark();
Global.testingServer.db.groups.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteGroup;
}

View File

@@ -28,15 +28,23 @@ public class TestDBTable extends iDBTable<Test> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
//columns.get(0).setVisible(false);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()) {
{
addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
}
};
}
};
}
@Override
@@ -131,15 +139,6 @@ public class TestDBTable extends iDBTable<Test> {
return selectedTests.isEmpty() ? allTests : selectedTests;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()) {
{
addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
}
};
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteTest;
}

View File

@@ -32,7 +32,7 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -42,6 +42,16 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
columns.get(6).setRendererClass(RendererMultiline.class);
columns.get(6).setMaxWidth(500);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations);
}
};
}
@Override
@@ -120,16 +130,6 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteConfiguration;
}

View File

@@ -38,7 +38,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -69,6 +69,51 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.DownloadDVMPackage).Do();
}
@Override
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"));
}
});
}
};
}
};
}
@Override
@@ -128,51 +173,6 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
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"));
}
});
}
};
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteDVMPackage;
}

View File

@@ -71,20 +71,18 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
//-
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
/*
columns.get(5).setRenderer(TableRenderers.RendererMultiline);
columns.get(5).setMaxWidth(500);
columns.get(7).setRenderer(TableRenderers.RendererMultiline);
columns.get(8).setRenderer(TableRenderers.RendererMultiline);
columns.get(15).setRenderer(TableRenderers.RendererMultiline);
*/
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings);
}
};
}
@@ -150,14 +148,6 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
return (Global.mainModule.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteDVMSettings;
}

View File

@@ -62,7 +62,7 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -73,6 +73,10 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
columns.get(6).setRendererClass(RendererStatusEnum.class);
columns.get(13).setRendererClass(RendererProgressBar.class);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
};
}
@Override
@@ -164,8 +168,4 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
}

View File

@@ -34,7 +34,7 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -49,6 +49,16 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
columns.get(7).setRendererClass(RendererMultiline.class);
columns.get(7).setMaxWidth(500);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforConfiguration,
PassCode.EditSapforConfiguration,
PassCode.ShowCurrentSAPFORConfigurationTests,
PassCode.SaveCurrentSAPFORConfiguration,
PassCode.DeleteSapforConfiguration,
PassCode.StartSelectedSAPFORConfigurations);
}
};
}
@Override
@@ -133,16 +143,6 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
return null;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforConfiguration,
PassCode.EditSapforConfiguration,
PassCode.ShowCurrentSAPFORConfigurationTests,
PassCode.SaveCurrentSAPFORConfiguration,
PassCode.DeleteSapforConfiguration,
PassCode.StartSelectedSAPFORConfigurations);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteSapforConfiguration;
}

View File

@@ -38,7 +38,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
@@ -55,6 +55,50 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.CompareSapforPackages).Do();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
{
addSeparator();
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode.DeleteSapforPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
};
}
@Override
@@ -108,50 +152,6 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
{
addSeparator();
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode.DeleteSapforPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteSapforPackage;
}

View File

@@ -34,20 +34,18 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
/*
columns.get(5).setRenderer(TableRenderers.RendererAutoConfiguration);
columns.get(5).setEditor(TableEditors.EditorAutoConfiguration);
columns.get(5).setMinWidth(25);
columns.get(5).setMaxWidth(25);
columns.get(6).setMaxWidth(300);
*/
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforSettings,
PassCode.CloneSapforSettings,
PassCode.EditSapforSettings,
PassCode.DeleteSapforSettings);
}
};
}
@@ -120,14 +118,6 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
return res;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforSettings,
PassCode.CloneSapforSettings,
PassCode.EditSapforSettings,
PassCode.DeleteSapforSettings);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteSapforSettings;
}

View File

@@ -46,14 +46,17 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
protected void AdditionalInitColumns() {
//columns.get(0).setVisible(false);
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforSettingsCommand,
PassCode.EditSapforSettingsCommand,
PassCode.DeleteSapforSettingsCommand);
}
};
}
@@ -85,13 +88,6 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
return res;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforSettingsCommand,
PassCode.EditSapforSettingsCommand,
PassCode.DeleteSapforSettingsCommand);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteSapforSettingsCommand;
}

View File

@@ -47,7 +47,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this,mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false);
@@ -68,6 +68,14 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
public boolean hasCheckBox() {
return true;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr,
PassCode.DeleteServerSapfor);
}
};
}
@Override
@@ -81,14 +89,6 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr,
PassCode.DeleteServerSapfor);
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteServerSapfor;
}