продолжение рефакторинга таблиц. перевод меню баров в интерфейс
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user