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/DVM/DVMConfiguration/DVMConfigurationDBTable.java
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;
}

92
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
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;
}

24
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
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;
}

10
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
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);
}
}