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-17 21:24:55 +03:00
parent debc1a6cae
commit 452c023f1d
45 changed files with 515 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
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;
}

90
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
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;
}

24
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
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;
}

16
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
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;
}

18
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
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;
}