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-11 00:00:30 +03:00
parent a11b7711f7
commit f317ab1aa1
341 changed files with 1866 additions and 1688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/_VisualDVM/Visual/Windows/TasksComparisonForm.java
View File

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