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-08 01:30:25 +03:00
parent d0c08a2c7e
commit 18ceb04325
91 changed files with 442 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Visual_DVM_2021/UI/Main/TasksComparisonForm.java
View File

@@ -1,7 +1,8 @@
package Visual_DVM_2021.UI.Main;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus_2023.MenuBarButton;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import javax.swing.*;
@@ -28,7 +29,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
//в отличие от комбо боксов, тут события нажатия на кнопку, нет.
if (isReady()) {
if (slave.isReady()) {
if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
DoComparePass(true);
} else
DoShowPass(true);
@@ -39,7 +40,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
} else {
if (isReady()) {
if (master.isReady()) {
if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
master.DoComparePass(true);
} else
master.DoShowPass(true);