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

2
src/_VisualDVM/Passes/All/CompareDVMRunTasks.java
View File

@@ -22,7 +22,7 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
master = null;
slave = null;
//--
target = Global.testingServer.db.dvmRunTasks.getSelectedItems();
target = Global.testingServer.db.dvmRunTasks.getUI().getSelectedItems();
if (target.size() == 2) {
if (UI.Question("Назначить задачу " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" +
"\n(в случае отказа, будет назначена задача " + Utils_.Brackets(target.get(1).getPK()) + ")")) {

2
src/_VisualDVM/Passes/All/CompareSapforPackages.java
View File

@@ -22,7 +22,7 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
master = null;
slave = null;
//--
target = Global.testingServer.db.sapforPackages.getSelectedItems();
target = Global.testingServer.db.sapforPackages.getUI().getSelectedItems();
if (target.size() == 2) {
if (UI.Question("Назначить пакет " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" +
"\n(в случае отказа, будет назначен пакет " + Utils_.Brackets(target.get(1).getPK()) + ")")) {

4
src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java
View File

@@ -58,8 +58,8 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
styles = null;
target = null;
//--
if (Global.testingServer.db.dvmPackages.getSelectedCount() > 0) {
target = Global.testingServer.db.dvmPackages.getSelectedItems();
if (Global.testingServer.db.dvmPackages.getUI().getSelectedCount() > 0) {
target = Global.testingServer.db.dvmPackages.getUI().getSelectedItems();
} else {
if (Global.mainModule.Check(Log, Current.DVMPackage)) {
target = new Vector<>();

2
src/_VisualDVM/Passes/All/Run.java
View File

@@ -82,7 +82,7 @@ public class Run extends Pass<db_project_info> {
task.setProgress(i, runTasks.size());
//-
Global.mainModule.getDb().runTasks.RefreshUI();
Global.mainModule.getDb().runTasks.SetCurrentObjectByUI(task.id);
Global.mainModule.getDb().runTasks.getUI().SetCurrentByPK(task.id);
//-
subpass.Do(task, target);
//-

1
src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
View File

@@ -58,7 +58,6 @@ public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowVariantsFilter();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowTotalVariantsCount();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowFilteredVariantsCount();
Global.mainModule.getUI().getVersionsWindow().getVariantsWindow().ShowCheckedVariantsCount();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions();
Global.mainModule.getUI().getMainWindow().getProjectWindow().getAnalysisWindow().ShowProjectMaxDim();
super.showDone();

4
src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
View File

@@ -43,10 +43,10 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
if (!Global.mainModule.getCompiler().versionLoaded)
Global.mainModule.getPass(PassCode.ShowCompilerVersion).Do(Global.mainModule.getCompiler(), false);
//-----
if (!Global.testingServer.db.dvm_configurations.CheckSelectedOrCurrent(Log)) {
if (!Global.testingServer.db.dvm_configurations.getUI().CheckSelectedOrCurrent(Log)) {
return false;
}
Vector<DVMConfiguration> configurations = Global.testingServer.db.dvm_configurations.getSelectedOrCurrent();
Vector<DVMConfiguration> configurations = Global.testingServer.db.dvm_configurations.getUI().getSelectedOrCurrent();
//---
target = new DVMPackage(
Global.mainModule.getAccount(),

4
src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java
View File

@@ -35,10 +35,10 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
return false;
}
//--
if (!Global.testingServer.db.sapforConfigurations.CheckSelectedOrCurrent(Log)) {
if (!Global.testingServer.db.sapforConfigurations.getUI().CheckSelectedOrCurrent(Log)) {
return false;
}
configurations = Global.testingServer.db.sapforConfigurations.getSelectedOrCurrent();
configurations = Global.testingServer.db.sapforConfigurations.getUI().getSelectedOrCurrent();
target = new SapforPackage(Global.mainModule.getAccount(),
Global.mainModule.getServerSapfor(),
configurations,

6
src/_VisualDVM/Passes/All/UpdateSelectedComponents.java
View File

@@ -22,18 +22,18 @@ public class UpdateSelectedComponents extends Pass<Vector<Component>> {
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
//------------------------
if (Global.Components.getSelectedCount() == 0) {
if (Global.Components.getUI().getSelectedCount() == 0) {
Log.Writeln_("Не отмечено ни одного компонента!");
return false;
}
target = Global.Components.getSelectedItems();
target = Global.Components.getUI().getSelectedItems();
return true;
}
@Override
public String getStartDescription() {
Vector<String> question = new Vector<>();
question.add("Обновить компоненты");
for (Component component : Global.Components.getSelectedItems()) {
for (Component component : Global.Components.getUI().getSelectedItems()) {
question.add(component.getComponentType().getDescription());
}
return String.join("\n", question);

2
src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java
View File

@@ -20,7 +20,7 @@ public abstract class VariantsMassPass extends CurrentProjectPass {
protected boolean canStart(Object... args) throws Exception {
count = 0;
if (super.canStart(args)) {
count = target.parallelVariants.getSelectedCount();
count = target.parallelVariants.getUI().getSelectedCount();
if (count == 0) {
Log.Writeln_("Не выбрано ни одного параллельного варианта");
return false;

4
src/_VisualDVM/Passes/Server/DeleteServerObject.java
View File

@@ -12,8 +12,8 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().getTable(d).getCurrent();
return getDb().getTable(d).CheckCurrent(Log) && getDb().getTable(d).ShowDeleteObjectDialog(target);
target = (D) getDb().getTable(d).getUI().getCurrent();
return getDb().getTable(d).getUI().CheckCurrent(Log) && getDb().getTable(d).ShowDeleteObjectDialog(target);
}
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override

4
src/_VisualDVM/Passes/Server/DeleteServerObjects.java
View File

@@ -36,9 +36,9 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
@Override
protected boolean canStart(Object... args) throws Exception {
DBTable table = getDb().getTable(d);
if (!table.CheckSelectedOrCurrent(Log))
if (!table.getUI().CheckSelectedOrCurrent(Log))
return false;
target = table.getSelectedOrCurrentKeys();
target = table.getUI().getSelectedOrCurrentKeys();
return table.ShowDeleteObjectsDialog(target.size());
}
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.

4
src/_VisualDVM/Passes/Server/EditServerObject.java
View File

@@ -15,8 +15,8 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
//--
@Override
protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().getTable(d).getCurrent();
return getDb().getTable(d).CheckCurrent(Log) && getDb().getTable(d).ShowEditObjectDialog(target);
target = (D) getDb().getTable(d).getUI().getCurrent();
return getDb().getTable(d).getUI().CheckCurrent(Log) && getDb().getTable(d).ShowEditObjectDialog(target);
}
//--
@Override

4
src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
View File

@@ -33,12 +33,12 @@ public abstract class SaveCurrentConfiguration<C extends Configuration, S extend
tests = new Vector<>();
settings = new Vector<>();
//---
for (Group group : Global.testingServer.db.groups.getSelectedItems()) {
for (Group group : Global.testingServer.db.groups.getUI().getSelectedItems()) {
groups.add(group);
Vector<Test> groupTests = Global.testingServer.db.tests.getSelectedGroupTests(group);
tests.addAll(groupTests);
}
for (Object setting : Global.testingServer.db.getTable(s).getSelectedItems()) {
for (Object setting : Global.testingServer.db.getTable(s).getUI().getSelectedItems()) {
settings.add((Settings) setting);
}
return true;