M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-25 00:50:19 +03:00
parent 9482abefcc
commit f2de9054d0
52 changed files with 101 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (server.db.bugReports.getUI().Check(Log)) {
if (server.db.bugReports.getUI().CheckCurrent(Log)) {
target = server.db.bugReports.getUI().getCurrent();
if (!target.CheckNotDraft(Log))
return false;

3
src/_VisualDVM/Passes/All/ApplyBugReportSettings.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -22,7 +21,7 @@ public class ApplyBugReportSettings extends Pass<BugReport> {
}
@Override
protected boolean canStart(Object... args) {
if (Global.componentsServer.db.bugReports.getUI().Check(Log)) {
if (Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log)) {
target = Global.componentsServer.db.bugReports.getUI().getCurrent();
long vv = target.visualiser_version;
if (vv < 500) {

3
src/_VisualDVM/Passes/All/ApplyProfile.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.All;
import Common.MainModule_;
import Common.Passes.Pass;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
@@ -23,7 +22,7 @@ public class ApplyProfile extends Pass<SapforProfile> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (MainModule_.instance.getDb().getTable(SapforProfile.class).getUI().Check(Log)) {
if (MainModule_.instance.getDb().getTable(SapforProfile.class).getUI().CheckCurrent(Log)) {
target = MainModule_.instance.getDb().getTable(SapforProfile.class).getUI().getCurrent();
return true;
}

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

@@ -33,7 +33,7 @@ public class Compile extends Pass<db_project_info> {
}
@Override
protected boolean canStart(Object... args) {
if (Global.mainModule.Check(Log, Current.Project) && Global.mainModule.getDb().Check(Log, Machine.class, User.class, Makefile.class)) {
if (Global.mainModule.Check(Log, Current.Project) && Global.mainModule.getDb().CheckCurrent(Log, Machine.class, User.class, Makefile.class)) {
target = Global.mainModule.getProject();
//--
machine = Global.mainModule.getDb().getTable(Machine.class).getUI().getCurrent();

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

@@ -27,7 +27,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
Log.Writeln_("Вы не являетесь администратором");
return false;
}
if (! Global.testingServer.db.serverSapfors.getUI().Check(Log)) {
if (! Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false;
}
return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");

3
src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
View File

@@ -4,7 +4,6 @@ import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -71,7 +70,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
if (args.length == 0) {
//--
from_files_chooser = true;
if (!Global.testingServer.db.groups.getUI().Check(Log))
if (!Global.testingServer.db.groups.getUI().CheckCurrent(Log))
return false;
group = Global.testingServer.db.groups.getUI().getCurrent();
if (!selectFiles())

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

@@ -15,7 +15,7 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
@Override
protected boolean canStart(Object... args) throws Exception {
if (args.length == 0) {
if (Global.testingServer.db.groups.getUI().Check(Log) && Global.mainModule.Check(Log, Current.Project)) {
if (Global.testingServer.db.groups.getUI().CheckCurrent(Log) && Global.mainModule.Check(Log, Current.Project)) {
project = Global.mainModule.getProject();
if (super.canStart(
project.Home,

3
src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -20,7 +19,7 @@ public class CreateTestsFromFiles extends PublishTests {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.testingServer.db.groups.getUI().Check(Log)) {
if (Global.testingServer.db.groups.getUI().CheckCurrent(Log)) {
Utils.RestoreSelectedDirectory(fileChooser);
Vector<File> files = fileChooser.ShowMultiDialog();
if (files.isEmpty()) {

3
src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info;
@@ -22,7 +21,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
//---
if (Global.testingServer.db.groups.getUI().Check(Log)) {
if (Global.testingServer.db.groups.getUI().CheckCurrent(Log)) {
group = Global.testingServer.db.groups.getUI().getCurrent();
} else
return false;

3
src/_VisualDVM/Passes/All/DownloadDVMPackage.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
@@ -13,7 +12,7 @@ public class DownloadDVMPackage extends DownloadDVMPackages {
return "/icons/Comparsion.png";
}
protected boolean canStart(Object... args) throws Exception {
if (Global.testingServer.db.dvmPackages.getUI().Check(Log)) {
if (Global.testingServer.db.dvmPackages.getUI().CheckCurrent(Log)) {
//--
dvmPackage = Global.testingServer.db.dvmPackages.getUI().getCurrent();
//--

3
src/_VisualDVM/Passes/All/DownloadTaskTest.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -12,7 +11,7 @@ public class DownloadTaskTest extends DownloadTest {
protected boolean canStart(Object... args) throws Exception {
target = null;
if (Global.mainModule.getAccount().CheckRegistered(Log) &&
Global.testingServer.db.dvmRunTasks.getUI().Check(Log)) {
Global.testingServer.db.dvmRunTasks.getUI().CheckCurrent(Log)) {
DVMRunTask task = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
//-- квазиобъект, нам от него нужно только имя.
target = new Test();

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

@@ -21,7 +21,7 @@ public class DownloadTest extends TestingSystemPass<Test> {
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.mainModule.getAccount().CheckRegistered(Log) &&
Global.testingServer.db.tests.getUI().Check(Log)
Global.testingServer.db.tests.getUI().CheckCurrent(Log)
) {
target = Global.testingServer.db.tests.getUI().getCurrent();
return true;

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

@@ -5,7 +5,6 @@ import Common.Utils.Index;
import Common.Utils.Utils_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
@@ -61,7 +60,7 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
if (Global.testingServer.db.dvmPackages.getUI().getSelectedCount() > 0) {
target = Global.testingServer.db.dvmPackages.getUI().getSelectedItems();
} else {
if (Global.testingServer.db.dvmPackages.getUI().Check(Log)) {
if (Global.testingServer.db.dvmPackages.getUI().CheckCurrent(Log)) {
target = new Vector<>();
target.add(
Global.testingServer.db.dvmPackages.getUI().getCurrent()

3
src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.Server.ServerCode;
@@ -11,7 +10,7 @@ public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass<Vec
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
return Global.components.getUI().Check(Log);
return Global.components.getUI().CheckCurrent(Log);
}
@Override
protected void ServerAction() throws Exception {

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

@@ -20,7 +20,7 @@ public class InitialiseUser extends Pass {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return MainModule_.instance.getDb().Check(Log, Machine.class, User.class);
return MainModule_.instance.getDb().CheckCurrent(Log, Machine.class, User.class);
}
@Override
protected void body() throws Exception {

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

@@ -22,7 +22,7 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.componentsServer.db.Check(Log, BugReport.class) &&
if (Global.componentsServer.db.CheckCurrent(Log, BugReport.class) &&
(target = Global.componentsServer.db.bugReports.getUI().getCurrent()).CheckNotDraft(Log)) {
if (!target.project_version.isEmpty()) {
root = Paths.get(ComponentsSet.visualiser.getWorkspace().getAbsolutePath(),

3
src/_VisualDVM/Passes/All/PickCompilerEnvironments.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Passes.Pass;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
@@ -28,7 +27,7 @@ public class PickCompilerEnvironments extends Pass<String> {
//-
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.mainModule.getDb().runConfigurations.getUI().Check(Log)) {
if (Global.mainModule.getDb().runConfigurations.getUI().CheckCurrent(Log)) {
configuration = Global.mainModule.getDb().runConfigurations.getUI().getCurrent();
if (configuration.compiler_id == CommonConstants.Nan) {
Log.Writeln_("Отсутвует DVM компилятор, связанный с текущей конфигурацией запуска.\n" +

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

@@ -21,7 +21,7 @@ public class PublishBugReport extends Pass<BugReport> {
}
@Override
protected boolean canStart(Object... args) {
if ( Global.componentsServer.db.bugReports.getUI().Check(Log)) {
if ( Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log)) {
target = Global.componentsServer.db.bugReports.getUI().getCurrent();
if (!target.state.equals(BugReportState.draft)) {
Log.Writeln_("Отчёт об ошибке " + target.id + " уже опубликован!");

3
src/_VisualDVM/Passes/All/PublishComponent.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
@@ -41,7 +40,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
Log.Writeln_("Вы не являетесь администратором");
}
;
if (Global.components.getUI().Check(Log)) {
if (Global.components.getUI().CheckCurrent(Log)) {
target = Global.components.getUI().getCurrent();
target.needs_update_minimal_version = false;
f.fields.cbUpdateMinimalVersion.setSelected(false);

3
src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.PublishServerObject;
import _VisualDVM.TestingSystem.Common.TestingServer;
@@ -16,6 +15,6 @@ public class PublishSapforSettingsCommand extends PublishServerObject<TestingSer
}
@Override
protected boolean canStart(Object... args) throws Exception {
return Global.testingServer.db.getTable(SapforSettings.class).getUI().Check(Log) && super.canStart(args);
return Global.testingServer.db.getTable(SapforSettings.class).getUI().CheckCurrent(Log) && super.canStart(args);
}
}

3
src/_VisualDVM/Passes/All/RemoteInitialiseUser.java
View File

@@ -3,7 +3,6 @@ import Common.MainModule_;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -19,7 +18,7 @@ public class RemoteInitialiseUser extends ConnectionPass<RemoteFile> {
}
@Override
protected boolean canStart(Object... args) {
return MainModule_.instance.getDb().getTable(User.class).getUI().Check(Log);
return MainModule_.instance.getDb().getTable(User.class).getUI().CheckCurrent(Log);
}
@Override
protected void Connect() throws Exception {

3
src/_VisualDVM/Passes/All/ReplaceTestProject.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingSystemPass;
@@ -34,7 +33,7 @@ public class ReplaceTestProject extends CreateTestFromProject {
}
@Override
protected boolean initTarget() throws Exception {
if (Global.testingServer.db.tests.getUI().Check(Log)) {
if (Global.testingServer.db.tests.getUI().CheckCurrent(Log)) {
target = Global.testingServer.db.tests.getUI().getCurrent();
return true;
}

3
src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
View File

@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -33,7 +32,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
//-
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Global.testingServer.db.groups.getUI().Check(Log))
if (!Global.testingServer.db.groups.getUI().CheckCurrent(Log))
return false;
group = Global.testingServer.db.groups.getUI().getCurrent();
//--->>>

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

@@ -46,7 +46,7 @@ public class Run extends Pass<db_project_info> {
protected boolean canStart(Object... args) {
subpass = null;
if ((Global.mainModule.Check(Log, Current.Project))&&
MainModule_.instance.getDb().Check(Log,Machine.class, User.class, Makefile.class, RunConfiguration.class,CompilationTask.class)) {
MainModule_.instance.getDb().CheckCurrent(Log,Machine.class, User.class, Makefile.class, RunConfiguration.class,CompilationTask.class)) {
//-
target = Global.mainModule.getProject();
//-

3
src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforModification;
@@ -23,7 +22,7 @@ public class SPF_ModifyArrayDistribution extends SapforModification {
protected boolean canStart(Object... args) throws Exception {
region = null;
if (
Global.mainModule.getProject().parallelRegions.getUI().Check(Log)
Global.mainModule.getProject().parallelRegions.getUI().CheckCurrent(Log)
&& super.canStart(args) && Global.mainModule.getPass(PassCode.SPF_GetArrayLinks).Do()) {
region = Global.mainModule.getProject().parallelRegions.getUI().getCurrent();
DBObjectDialog dialog = new DBObjectDialog<ParallelRegion, ParallelRegionFields>(ParallelRegionFields.class) {

3
src/_VisualDVM/Passes/All/SaveBugReportExecutor.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
public class SaveBugReportExecutor extends UpdateBugReportField {
@Override
@@ -12,7 +11,7 @@ public class SaveBugReportExecutor extends UpdateBugReportField {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return Global.componentsServer.db.subscribers.getUI().Check(Log) &&
return Global.componentsServer.db.subscribers.getUI().CheckCurrent(Log) &&
super.canStart("executor",Global.componentsServer.db.subscribers.getUI().getCurrent().name,
"executor_address", Global.componentsServer.db.subscribers.getUI().getCurrent().address
);

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

@@ -9,7 +9,7 @@ public class SelectRemoteFile extends CurrentConnectionPass {
boolean needs_directory = false;
@Override
protected boolean canStart(Object... args) {
if (Global.mainModule.getDb().Check(Log, Machine.class, User.class)) {
if (Global.mainModule.getDb().CheckCurrent(Log, Machine.class, User.class)) {
needs_directory = (boolean) args[0];
Global.mainModule.set(Current.RemoteFile, null);
return true;

3
src/_VisualDVM/Passes/All/ShowCompilerHelp.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.All;
import Common.MainModule_;
import Common.Passes.Pass;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Machine.Machine;
@@ -25,7 +24,7 @@ public class ShowCompilerHelp extends Pass<String> {
protected boolean canStart(Object... args) throws Exception {
target = null;
if (args.length == 0) {
if (MainModule_.instance.getDb().getTable(Compiler.class).getUI().Check(Log)) {
if (MainModule_.instance.getDb().getTable(Compiler.class).getUI().CheckCurrent(Log)) {
compiler = MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent();
needsShow = true;
return true;

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

@@ -24,7 +24,7 @@ public class ShowCompilerVersion extends Pass<String> {
protected boolean canStart(Object... args) throws Exception {
target = null;
if (args.length == 0) {
if (MainModule_.instance.getDb().getTable(Compiler.class).getUI().Check(Log)) {
if (MainModule_.instance.getDb().getTable(Compiler.class).getUI().CheckCurrent(Log)) {
compiler = MainModule_.instance.getDb().getTable(Compiler.class).getUI().getCurrent();
needsShow = true;
return true;

3
src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.Component.Component;
@@ -25,7 +24,7 @@ public class ShowComponentChangesLog extends ComponentsRepositoryPass<Component>
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.components.getUI().Check(Log)) {
if (Global.components.getUI().CheckCurrent(Log)) {
target = Global.components.getUI().getCurrent();
return true;
}

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

@@ -22,7 +22,7 @@ public class ShowMakefilePreview extends Pass<db_project_info> {
}
@Override
protected boolean canStart(Object... args) {
if (Global.mainModule.Check(Log, Current.Project) &&MainModule_.instance.getDb().getTable(Makefile.class).getUI().Check(Log) ) {
if (Global.mainModule.Check(Log, Current.Project) &&MainModule_.instance.getDb().getTable(Makefile.class).getUI().CheckCurrent(Log) ) {
target = Global.mainModule.getProject();
return true;
}

3
src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
public class ShowSapforCompilationErr extends ShowTestingServerFile {
@@ -18,7 +17,7 @@ public class ShowSapforCompilationErr extends ShowTestingServerFile {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Global.testingServer.db.serverSapfors.getUI().Check(Log)) {
if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false;
}
return super.canStart("Поток ошибок", new RemoteFile(

3
src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
public class ShowSapforCompilationOut extends ShowTestingServerFile {
@@ -18,7 +17,7 @@ public class ShowSapforCompilationOut extends ShowTestingServerFile {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Global.testingServer.db.serverSapfors.getUI().Check(Log)) {
if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false;
}
return super.canStart("Поток вывода", new RemoteFile(

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

@@ -29,7 +29,7 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
if (!Global.mainModule.getAccount().CheckRegistered(Log)) {
return false;
}
if (!MainModule_.instance.getDb().Check(Log, Machine.class, User.class, Compiler.class))
if (!MainModule_.instance.getDb().CheckCurrent(Log, Machine.class, User.class, Compiler.class))
return false;
//--
Machine machine = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent();

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

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.PublishServerObject;
import _VisualDVM.TestingSystem.Common.TestingServer;
@@ -27,7 +26,7 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
if (!Global.mainModule.getAccount().CheckRegistered(Log)) {
return false;
}
if (!Global.testingServer.db.serverSapfors.getUI().Check(Log)) {
if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false;
}
if (!Global.testingServer.db.serverSapfors.getUI().getCurrent().state.equals(ServerSapforState.Done)) {

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

@@ -24,7 +24,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Global.componentsServer.db.bugReports.getUI().Check(Log))
if (!Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log))
return false;
old_description = "";
old_comment = "";

3
src/_VisualDVM/Passes/All/UpdateBugReportProgress.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Visual.Windows.Dialog.PercentsForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
public class UpdateBugReportProgress extends UpdateBugReportField {
@Override
@@ -13,7 +12,7 @@ public class UpdateBugReportProgress extends UpdateBugReportField {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Global.componentsServer.db.bugReports.getUI().Check(Log))
if (!Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log))
return false;
PercentsForm f = new PercentsForm();
if (f.ShowDialog("Завершённость работы над ошибкой",

3
src/_VisualDVM/Passes/CurrentComponentPass.java
View File

@@ -1,12 +1,11 @@
package _VisualDVM.Passes;
import Common.Passes.Pass;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Repository.Component.Component;
public abstract class CurrentComponentPass extends Pass<Component> {
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.components.getUI().Check(Log)) {
if (Global.components.getUI().CheckCurrent(Log)) {
target = Global.components.getUI().getCurrent();
return true;
}

3
src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.SSH;
import Common.MainModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User;
//завязан на текущие машину и юзера
@@ -11,7 +10,7 @@ public abstract class CurrentConnectionPass<T> extends ConnectionPass<T> {
}
@Override
protected boolean canStart(Object... args) {
return MainModule_.instance.getDb().getTable(User.class).getUI().Check(Log);
return MainModule_.instance.getDb().getTable(User.class).getUI().CheckCurrent(Log);
}
@Override
public void Connect() throws Exception {

2
src/_VisualDVM/Passes/Server/CloneServerObject.java
View File

@@ -19,7 +19,7 @@ public abstract class CloneServerObject<S extends RepositoryServer, D extends ri
@Override
protected boolean canStart(Object... args) throws Exception {
src = null;
if (!server.db.getTable(currentClass()).getUI().Check(Log))
if (!server.db.getTable(currentClass()).getUI().CheckCurrent(Log))
return false;
//---------
pk = null;

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

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

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

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

3
src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.Testing;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.TestingSystemPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -20,7 +19,7 @@ public abstract class AbortTestingPackage extends TestingSystemPass<TestingPacka
@Override
protected boolean canStart(Object... args) throws Exception {
packageToKill = null;
if (server.db.Check(Log, currentClass())) {
if (server.db.CheckCurrent(Log, currentClass())) {
target = (TestingPackage) server.db.getTable(currentClass()).getUI().getCurrent();
switch (target.state) {
case Done:

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

@@ -29,7 +29,7 @@ public abstract class SaveCurrentConfiguration<C extends Configuration, S extend
protected abstract Class currentClass();
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Global.testingServer.db.getTable(currentClass()).getUI().Check(Log)) return false;
if (!Global.testingServer.db.getTable(currentClass()).getUI().CheckCurrent(Log)) return false;
target = (C) Global.testingServer.db.getTable(currentClass()).getUI().getCurrent();
//--
groups = new Vector<>();

2
src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java
View File

@@ -21,7 +21,7 @@ public abstract class ShowCurrentConfigurationTests<C extends Configuration> ext
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;
if (Global.testingServer.db.getTable(currentClass()).getUI().Check(Log)) {
if (Global.testingServer.db.getTable(currentClass()).getUI().CheckCurrent(Log)) {
target = (C) (Global.testingServer.db.getTable(currentClass()).getUI().getCurrent());
return true;
}

2
src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
View File

@@ -96,7 +96,7 @@ public class SapforPackagesComparisonForm {
RemoveObject();
//---
TextLog log = new TextLog();
if (Global.testingServer.db.sapforPackages.getUI().Check(log)) {
if (Global.testingServer.db.sapforPackages.getUI().CheckCurrent(log)) {
object = Global.testingServer.db.sapforPackages.getUI().getCurrent();
if (object.isLoaded() || (Global.mainModule.getPass(PassCode.DownloadSapforPackage).Do(object))) {
showObject();