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

10
src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
View File

@@ -1,8 +1,8 @@
package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.ProjectFile;
@@ -35,10 +35,10 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = Global.db.settings.get(SettingName.ExtensionsOn).toBoolean();
boolean ExtensionsOn = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean();
String name1 = ExtensionsOn ? getMaster().file.file.getName() : CommonUtils.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : CommonUtils.getFileNameWithoutExtension(file.file);
if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -83,7 +83,7 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
cbFile.setSelectedIndex(-1);
for (int i = 0; i < cbFile.getItemCount(); ++i) {
ProjectFile projectFile = cbFile.getItemAt(i);
if (Global.db.settings.get(SettingName.ExtensionsOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_in.file.getName())) {
cbFile.setSelectedIndex(i);
@@ -106,6 +106,6 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
}
@Override
protected boolean fortranWrapsOn() {
return Global.db.settings.get(SettingName.FortranWrapsOn).toBoolean();
return ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FortranWrapsOn).toBoolean();
}
}