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

55
.idea/workspace.xml generated
View File

@@ -7,14 +7,57 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyProfile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Compile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InitialiseUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Run.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SelectRemoteFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SelectRemoteFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowMakefilePreview.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowMakefilePreview.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/CurrentComponentPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/CurrentComponentPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

4
src/Common/Database/Database.java
View File

@@ -285,11 +285,11 @@ public abstract class Database {
} }
} }
//--- //---
public boolean Check(TextLog log, Class... tablesClasses) { public boolean CheckCurrent(TextLog log, Class... tablesClasses) {
for (Class tableClass : tablesClasses) { for (Class tableClass : tablesClasses) {
DBTable table = getTable(tableClass); DBTable table = getTable(tableClass);
if (table.getUI() != null) if (table.getUI() != null)
table.getUI().Check(log); table.getUI().CheckCurrent(log);
} }
return log.isEmpty(); return log.isEmpty();
} }

2
src/Common/Passes/AddObjectPass.java
View File

@@ -17,7 +17,7 @@ public abstract class AddObjectPass<D extends DBObject> extends ObjectPass<D> {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = d.newInstance(); target = d.newInstance();
return ((getOwnerClass() == null) || (getDb().getTable(getOwnerClass()).getUI().Check(Log))) && fillObjectFields(); return ((getOwnerClass() == null) || (getDb().getTable(getOwnerClass()).getUI().CheckCurrent(Log))) && fillObjectFields();
} }
protected boolean fillObjectFields() throws Exception { protected boolean fillObjectFields() throws Exception {
return getTable().getUI().ShowAddObjectDialog(target); return getTable().getUI().ShowAddObjectDialog(target);

2
src/Common/Passes/DeleteObjectPass.java
View File

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

2
src/Common/Passes/EditObjectPass.java
View File

@@ -14,7 +14,7 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (D) getTable().getUI().getCurrent(); target = (D) getTable().getUI().getCurrent();
return getTable().getUI().Check(Log) && getTable().getUI().ShowEditObjectDialog(target); return getTable().getUI().CheckCurrent(Log) && getTable().getUI().ShowEditObjectDialog(target);
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {

3
src/Common/Visual/DataSetControlForm.java
View File

@@ -450,8 +450,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
public Vector<Object> getSelectedKeys() { public Vector<Object> getSelectedKeys() {
return dataSource.Data.values().stream().filter(DBObject::isSelected).map(d -> d.getPK()).collect(Collectors.toCollection(Vector::new)); return dataSource.Data.values().stream().filter(DBObject::isSelected).map(d -> d.getPK()).collect(Collectors.toCollection(Vector::new));
} }
//переименовать в CheckCurrent public boolean CheckCurrent(TextLog log) {
public boolean Check(TextLog log) {
if (current == null) { if (current == null) {
log.Writeln_(dataSource.getSingleDescription() + " не выбран(а)"); log.Writeln_(dataSource.getSingleDescription() + " не выбран(а)");
return false; return false;

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

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

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

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

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

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

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

@@ -33,7 +33,7 @@ public class Compile extends Pass<db_project_info> {
} }
@Override @Override
protected boolean canStart(Object... args) { 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(); target = Global.mainModule.getProject();
//-- //--
machine = Global.mainModule.getDb().getTable(Machine.class).getUI().getCurrent(); 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_("Вы не являетесь администратором"); Log.Writeln_("Вы не являетесь администратором");
return false; return false;
} }
if (! Global.testingServer.db.serverSapfors.getUI().Check(Log)) { if (! Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false; return false;
} }
return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность."); 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.Utils.Utils_;
import Common.Visual.Windows.Dialog.VDirectoryChooser; import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -71,7 +70,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
if (args.length == 0) { if (args.length == 0) {
//-- //--
from_files_chooser = true; from_files_chooser = true;
if (!Global.testingServer.db.groups.getUI().Check(Log)) if (!Global.testingServer.db.groups.getUI().CheckCurrent(Log))
return false; return false;
group = Global.testingServer.db.groups.getUI().getCurrent(); group = Global.testingServer.db.groups.getUI().getCurrent();
if (!selectFiles()) if (!selectFiles())

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

@@ -15,7 +15,7 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
if (args.length == 0) { 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(); project = Global.mainModule.getProject();
if (super.canStart( if (super.canStart(
project.Home, project.Home,

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

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Visual.Windows.Dialog.VFileChooser; import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -20,7 +19,7 @@ public class CreateTestsFromFiles extends PublishTests {
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { 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); Utils.RestoreSelectedDirectory(fileChooser);
Vector<File> files = fileChooser.ShowMultiDialog(); Vector<File> files = fileChooser.ShowMultiDialog();
if (files.isEmpty()) { 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.Passes.Pass;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.UI; import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.Project.db_project_info;
@@ -22,7 +21,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = new Vector<>(); 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(); group = Global.testingServer.db.groups.getUI().getCurrent();
} else } else
return false; return false;

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

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

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

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

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

@@ -21,7 +21,7 @@ public class DownloadTest extends TestingSystemPass<Test> {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
if (Global.mainModule.getAccount().CheckRegistered(Log) && 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(); target = Global.testingServer.db.tests.getUI().getCurrent();
return true; 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.Utils.Utils_;
import Common.Visual.UI; import Common.Visual.UI;
import Common.Visual.Windows.Dialog.VDirectoryChooser; import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -61,7 +60,7 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
if (Global.testingServer.db.dvmPackages.getUI().getSelectedCount() > 0) { if (Global.testingServer.db.dvmPackages.getUI().getSelectedCount() > 0) {
target = Global.testingServer.db.dvmPackages.getUI().getSelectedItems(); target = Global.testingServer.db.dvmPackages.getUI().getSelectedItems();
} else { } else {
if (Global.testingServer.db.dvmPackages.getUI().Check(Log)) { if (Global.testingServer.db.dvmPackages.getUI().CheckCurrent(Log)) {
target = new Vector<>(); target = new Vector<>();
target.add( target.add(
Global.testingServer.db.dvmPackages.getUI().getCurrent() Global.testingServer.db.dvmPackages.getUI().getCurrent()

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

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

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

@@ -20,7 +20,7 @@ public class InitialiseUser extends Pass {
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { 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 @Override
protected void body() throws Exception { 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 @Override
protected boolean canStart(Object... args) throws Exception { 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)) { (target = Global.componentsServer.db.bugReports.getUI().getCurrent()).CheckNotDraft(Log)) {
if (!target.project_version.isEmpty()) { if (!target.project_version.isEmpty()) {
root = Paths.get(ComponentsSet.visualiser.getWorkspace().getAbsolutePath(), 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.CommonConstants;
import Common.Passes.Pass; import Common.Passes.Pass;
import Common.Visual.Windows.Dialog.Dialog; import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.Compiler.CompilerType;
@@ -28,7 +27,7 @@ public class PickCompilerEnvironments extends Pass<String> {
//- //-
@Override @Override
protected boolean canStart(Object... args) throws Exception { 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(); configuration = Global.mainModule.getDb().runConfigurations.getUI().getCurrent();
if (configuration.compiler_id == CommonConstants.Nan) { if (configuration.compiler_id == CommonConstants.Nan) {
Log.Writeln_("Отсутвует DVM компилятор, связанный с текущей конфигурацией запуска.\n" + Log.Writeln_("Отсутвует DVM компилятор, связанный с текущей конфигурацией запуска.\n" +

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

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

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

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

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

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Server.PublishServerObject; import _VisualDVM.Passes.Server.PublishServerObject;
import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.Common.TestingServer;
@@ -16,6 +15,6 @@ public class PublishSapforSettingsCommand extends PublishServerObject<TestingSer
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { 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.Passes.PassException;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -19,7 +18,7 @@ public class RemoteInitialiseUser extends ConnectionPass<RemoteFile> {
} }
@Override @Override
protected boolean canStart(Object... args) { 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 @Override
protected void Connect() throws Exception { protected void Connect() throws Exception {

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

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingSystemPass; import _VisualDVM.Passes.Server.TestingSystemPass;
@@ -34,7 +33,7 @@ public class ReplaceTestProject extends CreateTestFromProject {
} }
@Override @Override
protected boolean initTarget() throws Exception { 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(); target = Global.testingServer.db.tests.getUI().getCurrent();
return true; 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.UI;
import Common.Visual.Windows.Dialog.VFileChooser; import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -33,7 +32,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
//- //-
@Override @Override
protected boolean canStart(Object... args) throws Exception { 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; return false;
group = Global.testingServer.db.groups.getUI().getCurrent(); 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) { protected boolean canStart(Object... args) {
subpass = null; subpass = null;
if ((Global.mainModule.Check(Log, Current.Project))&& 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(); target = Global.mainModule.getProject();
//- //-

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

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforModification; import _VisualDVM.Passes.Sapfor.SapforModification;
@@ -23,7 +22,7 @@ public class SPF_ModifyArrayDistribution extends SapforModification {
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
region = null; region = null;
if ( 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()) { && super.canStart(args) && Global.mainModule.getPass(PassCode.SPF_GetArrayLinks).Do()) {
region = Global.mainModule.getProject().parallelRegions.getUI().getCurrent(); region = Global.mainModule.getProject().parallelRegions.getUI().getCurrent();
DBObjectDialog dialog = new DBObjectDialog<ParallelRegion, ParallelRegionFields>(ParallelRegionFields.class) { 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; package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
public class SaveBugReportExecutor extends UpdateBugReportField { public class SaveBugReportExecutor extends UpdateBugReportField {
@Override @Override
@@ -12,7 +11,7 @@ public class SaveBugReportExecutor extends UpdateBugReportField {
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { 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, super.canStart("executor",Global.componentsServer.db.subscribers.getUI().getCurrent().name,
"executor_address", Global.componentsServer.db.subscribers.getUI().getCurrent().address "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; boolean needs_directory = false;
@Override @Override
protected boolean canStart(Object... args) { 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]; needs_directory = (boolean) args[0];
Global.mainModule.set(Current.RemoteFile, null); Global.mainModule.set(Current.RemoteFile, null);
return true; return true;

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

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

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

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

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

@@ -22,7 +22,7 @@ public class ShowMakefilePreview extends Pass<db_project_info> {
} }
@Override @Override
protected boolean canStart(Object... args) { 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(); target = Global.mainModule.getProject();
return true; return true;
} }

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

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
public class ShowSapforCompilationErr extends ShowTestingServerFile { public class ShowSapforCompilationErr extends ShowTestingServerFile {
@@ -18,7 +17,7 @@ public class ShowSapforCompilationErr extends ShowTestingServerFile {
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { 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 false;
} }
return super.canStart("Поток ошибок", new RemoteFile( return super.canStart("Поток ошибок", new RemoteFile(

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

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
public class ShowSapforCompilationOut extends ShowTestingServerFile { public class ShowSapforCompilationOut extends ShowTestingServerFile {
@@ -18,7 +17,7 @@ public class ShowSapforCompilationOut extends ShowTestingServerFile {
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { 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 false;
} }
return super.canStart("Поток вывода", new RemoteFile( 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)) { if (!Global.mainModule.getAccount().CheckRegistered(Log)) {
return false; 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; return false;
//-- //--
Machine machine = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent(); 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; package _VisualDVM.Passes.All;
import Common.Visual.UI; import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Server.PublishServerObject; import _VisualDVM.Passes.Server.PublishServerObject;
import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.Common.TestingServer;
@@ -27,7 +26,7 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
if (!Global.mainModule.getAccount().CheckRegistered(Log)) { if (!Global.mainModule.getAccount().CheckRegistered(Log)) {
return false; return false;
} }
if (!Global.testingServer.db.serverSapfors.getUI().Check(Log)) { if (!Global.testingServer.db.serverSapfors.getUI().CheckCurrent(Log)) {
return false; return false;
} }
if (!Global.testingServer.db.serverSapfors.getUI().getCurrent().state.equals(ServerSapforState.Done)) { 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 @Override
protected boolean canStart(Object... args) throws Exception { 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; return false;
old_description = ""; old_description = "";
old_comment = ""; old_comment = "";

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

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

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

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

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

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.SSH; package _VisualDVM.Passes.SSH;
import Common.MainModule_; import Common.MainModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.User;
//завязан на текущие машину и юзера //завязан на текущие машину и юзера
@@ -11,7 +10,7 @@ public abstract class CurrentConnectionPass<T> extends ConnectionPass<T> {
} }
@Override @Override
protected boolean canStart(Object... args) { 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 @Override
public void Connect() throws Exception { 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 @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
src = null; src = null;
if (!server.db.getTable(currentClass()).getUI().Check(Log)) if (!server.db.getTable(currentClass()).getUI().CheckCurrent(Log))
return false; return false;
//--------- //---------
pk = null; 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 @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().getTable(d).getUI().getCurrent(); 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 @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 @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().getTable(d).getUI().getCurrent(); 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 @Override

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

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

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

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