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-13 22:08:13 +03:00
parent 09b64218bd
commit 6afa2dc892
240 changed files with 1472 additions and 1518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -52,7 +52,7 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
}
@Override
public boolean isVisible() {
return (!SapforPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) &&
return (!SapforPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(sender_address)) &&
(!SapforPackageDBTable.filterActive || state.isActive())
;
}

3
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
View File

@@ -4,6 +4,7 @@ import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Visual_DVM_2021.Passes.PassCode;
import _VisualDVM.Global;
import com.sun.org.glassfish.gmbal.Description;
public class SapforSettingsCommand extends riDBObject {
@Description("DEFAULT -1")
@@ -11,7 +12,7 @@ public class SapforSettingsCommand extends riDBObject {
public PassCode passCode = PassCode.SPF_RemoveDvmDirectives;
@Override
public boolean isVisible() {
return Current.HasSapforSettings() && (Current.getSapforSettings().id == sapforsettings_id);
return Global.mainModule.matchCurrentID(Current.SapforSettings,sapforsettings_id);
}
@Override
public void SynchronizeFields(DBObject src) {

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

@@ -4,6 +4,7 @@ import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields;
import Visual_DVM_2021.Passes.PassCode;
@@ -67,7 +68,7 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
@Override
public void ProcessResult() {
Result.passCode = (PassCode) fields.cbPassCode.getSelectedItem();
Result.sapforsettings_id = Current.getSapforSettings().id;
Result.sapforsettings_id = Global.mainModule.getSapforSettings().id;
}
};
}

3
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
View File

@@ -3,6 +3,7 @@ import Common.Current_;
import _VisualDVM.Current;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;
@@ -60,7 +61,7 @@ public class SapforTasksPackageTree extends DataTree {
//---
if (o instanceof SapforVersion_json) {
SapforVersion_json version = (SapforVersion_json) o;
Current_.set(current, version);
Global.mainModule.set(current, version);
if (current.equals(Current.SapforEtalonVersion))
UI.getMainWindow().getTestingWindow().ShowCurrentSapforPackageVersionEtalon();
else