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-22 15:25:06 +03:00
parent 319e6575c8
commit 38b2896e4a
102 changed files with 738 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -4,7 +4,6 @@ import Common.Passes.PassCode_;
import Common.Utils.Vector_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationsForm;
@@ -16,18 +15,6 @@ public class SapforConfigurationDBTable extends iDBTable<SapforConfiguration> {
super(SapforConfiguration.class);
}
@Override
public Current CurrentName() {
return Current.SapforConfiguration;
}
@Override
public String getSingleDescription() {
return "конфигурация";
}
@Override
public String getPluralDescription() {
return "конфигурации";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforConfigurationsForm(this, mountPanel);
}

15
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
@@ -16,6 +17,18 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.SapforConfiguration;
}
@Override
public String getSingleDescription() {
return "конфигурация";
}
@Override
public String getPluralDescription() {
return "конфигурации";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -65,7 +78,7 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforConfiguration,
PassCode.EditSapforConfiguration,
PassCode.ShowCurrentSAPFORConfigurationTests,

13
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforPackage;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm;
@@ -12,18 +11,6 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
super(SapforPackage.class);
}
@Override
public Current CurrentName() {
return Current.SapforPackage;
}
@Override
public String getSingleDescription() {
return "пакет";
}
@Override
public String getPluralDescription() {
return "пакеты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforPackagesForm(this, mountPanel);
}

77
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -1,13 +1,14 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI;
import Common.Database.Tables.DataSet;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -18,12 +19,22 @@ import javax.swing.*;
import java.util.Comparator;
import java.util.Date;
public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
public static boolean filterMyOnly = false;
public static boolean filterActive = false;
public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.SapforPackage;
}
@Override
public String getSingleDescription() {
return "пакет";
}
@Override
public String getPluralDescription() {
return "пакеты";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -81,7 +92,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeTests) {
return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
{
addSeparator();
addPasses(PassCode.AbortSapforPackage);
@@ -89,37 +100,6 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
addPasses(PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode.DeleteSapforPackage);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
filterMyOnly = !filterMyOnly;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
filterActive = !filterActive;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils_.getIcon(filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
});
}
};
}
@@ -133,9 +113,28 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
};
}
@Override
public boolean isObjectVisible(SapforPackage object) {
return super.isObjectVisible(object) &&
(!filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
(!filterActive || object.state.isActive());
protected void createFilters() {
AddFilter(new FilterFlag<SapforPackage>(dataSource, new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
}
}, false) {
@Override
protected boolean validate(SapforPackage object) {
return Global.mainModule.getAccount().email.equals(object.sender_address);
}
});
AddFilter(new FilterFlag<SapforPackage>(dataSource, new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
}
}, false) {
@Override
protected boolean validate(SapforPackage object) {
return object.state.isActive();
}
});
}
}

13
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java
View File

@@ -8,7 +8,6 @@ import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsFields;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsForm;
@@ -21,18 +20,6 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
super(SapforSettings.class);
}
@Override
public Current CurrentName() {
return Current.SapforSettings;
}
@Override
public String getSingleDescription() {
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
return "параметры тестирования";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforSettingsForm(this, mountPanel);
}

15
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
@@ -11,6 +12,18 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.SapforSettings;
}
@Override
public String getSingleDescription() {
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
return "параметры тестирования";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -37,7 +50,7 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforSettings,
PassCode.CloneSapforSettings,
PassCode.EditSapforSettings,

13
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
View File

@@ -4,7 +4,6 @@ import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
@@ -18,18 +17,6 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
super(SapforSettingsCommand.class);
}
@Override
public String getSingleDescription() {
return "команда";
}
@Override
public String getPluralDescription() {
return "команды";
}
@Override
public Current CurrentName() {
return Current.SapforSettingsCommand;
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforSettingsCommandsForm(this, mountPanel);
}

14
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
View File

@@ -13,6 +13,18 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.SapforSettingsCommand;
}
@Override
public String getSingleDescription() {
return "команда";
}
@Override
public String getPluralDescription() {
return "команды";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -33,7 +45,7 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.PublishSapforSettingsCommand,
PassCode.EditSapforSettingsCommand,
PassCode.DeleteSapforSettingsCommand);

13
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI.ServerSapforsForm;
@@ -12,18 +11,6 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
super(ServerSapfor.class);
}
@Override
public String getSingleDescription() {
return "версия SAPFOR";
}
@Override
public String getPluralDescription() {
return "версии SAPFOR";
}
@Override
public Current CurrentName() {
return Current.ServerSapfor;
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ServerSapforsForm(this, mountPanel);
}

15
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
View File

@@ -4,6 +4,7 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
@@ -15,6 +16,18 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.ServerSapfor;
}
@Override
public String getSingleDescription() {
return "версия SAPFOR";
}
@Override
public String getPluralDescription() {
return "версии SAPFOR";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -58,7 +71,7 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr,