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/DVM/DVMConfiguration/DVMConfigurationDBTable.java
View File

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

15
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.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;
@@ -14,6 +15,18 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.DVMConfiguration;
}
@Override
public String getSingleDescription() {
return "конфигурация";
}
@Override
public String getPluralDescription() {
return "конфигурации";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -61,7 +74,7 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,

13
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

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

17
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -8,6 +8,7 @@ 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;
@@ -22,6 +23,18 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.DVMPackage;
}
@Override
public String getSingleDescription() {
return "пакет";
}
@Override
public String getPluralDescription() {
return "пакеты";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -83,7 +96,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
//--
Global.testingServer.db.dvmRunTasks.ShowDVMPackage((DVMPackage) dataSource.getCurrent());
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(getCurrent());
Global.mainModule.getUI().getMainWindow().getTestingWindow().DropTestRunTasksComparison();
//--
}
@@ -99,7 +112,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription()) {
return new DataMenuBar(getPluralDescription()) {
{
addPasses(PassCode.SynchronizeTests);
addSeparator();

15
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
View File

@@ -4,7 +4,6 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
@@ -16,20 +15,6 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
super(DVMSettings.class);
}
@Override
public Current CurrentName() {
return Current.DVMSettings;
}
@Override
public String getSingleDescription() {
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
return "параметры тестирования";
}
//--
//-
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMSettingsForm(this, mountPanel);
}

15
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.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.DVM.DVMSettings.DVMSettings;
@@ -11,6 +12,18 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.DVMSettings;
}
@Override
public String getSingleDescription() {
return "параметры тестирования";
}
@Override
public String getPluralDescription() {
return "параметры тестирования";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -55,7 +68,7 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,

13
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksForm;
@@ -13,21 +12,9 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
super(Integer.class, DVMRunTask.class);
}
@Override
public String getSingleDescription() {
return "задача";
}
@Override
public String getPluralDescription() {
return "задачи";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMRunTasksForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.DVMRunTask;
}
public void ShowDVMPackage(DVMPackage dvmPackage) {
target = dvmPackage;
ClearUI();

15
src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
View File

@@ -7,6 +7,7 @@ import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -18,6 +19,18 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.DVMRunTask;
}
@Override
public String getSingleDescription() {
return "задача";
}
@Override
public String getPluralDescription() {
return "задачи";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -77,7 +90,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
@Override
protected void createFilters() {