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

5
src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java
View File

@@ -1,7 +1,8 @@
package Common_old.UI.Menus_2023.FastAccessMenuBar;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.VisualiserMenuBar;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -39,7 +40,7 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
if (pass.stats.HasUsages()) {
showPass(pass);
++i;
if (i > (Global.db.settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
if (i > (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
}
}
}

7
src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java
View File

@@ -1,8 +1,9 @@
package Common_old.UI.Menus_2023.MainMenuBar;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus.VisualiserMenuItem;
import Common_old.UI.Menus_2023.VisualiserMenu;
import GlobalData.DBLastProject.DBLastProject;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -20,7 +21,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
@Override
public void menuSelected(MenuEvent e) {
removeAll();
Vector<DBLastProject> projects = Global.db.lastProjects.getOrdered();
Vector<DBLastProject> projects = ((GlobalDatabase)CommonUtils.db).lastProjects.getOrdered();
int k = 1;
for (DBLastProject p : projects) {
if (new File(p.HomePath).exists() && p.lastOpened != 0) {
@@ -33,7 +34,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
});
add(i);
++k;
if (k > (Global.db.settings.get(SettingName.LastOpenedProjectsCount).toInt32())) break;
if (k > (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LastOpenedProjectsCount).toInt32())) break;
}
}
}

6
src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
View File

@@ -1,9 +1,9 @@
package Common_old.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu;
import Common.Utils.CommonUtils;
import _VisualDVM.Global;
import Common_old.UI.Menus.PropertiesSubmenu;
import Common_old.UI.Menus_2023.SettingsSubmenu;
import Common_old.UI.Menus_2023.VisualiserMenu;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
public class VisualiserSettingsMenu extends VisualiserMenu {
public VisualiserSettingsMenu() {
@@ -37,7 +37,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
SettingName.FortranWrapsOn,
SettingName.ComparsionDiffMergeOn
));
add(Global.db.settings.get(SettingName.Workspace).getMenuItem());
add(Global.db.settings.get(SettingName.BugReportsAgeLimit).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).getMenuItem());
}
}

9
src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java
View File

@@ -1,10 +1,11 @@
package Common_old.UI.Menus_2023.ProjectMenuBar;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.LanguagesSubmenu;
import Common_old.UI.Menus_2023.SettingsSubmenu;
import Common_old.UI.Menus_2023.StylesSubmenu;
import Common_old.UI.Menus_2023.VisualiserMenu;
import GlobalData.GlobalDatabase;
import GlobalData.Settings.SettingName;
import ProjectData.Files.LanguageStyle;
import ProjectData.LanguageName;
@@ -59,9 +60,9 @@ public class ProjectSettingsMenu extends VisualiserMenu {
SettingName.SaveModifications
));
addSeparator();
add(Global.db.settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem());
add(Global.db.settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem());
add(Global.db.settings.get(SettingName.GCOVLimit).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.GCOVLimit).getMenuItem());
}
public void ShowLanguage() {
mLanguage.setText("Язык: " + Current.getProject().languageName.getDescription());

4
src/Common_old/UI/Menus_2023/SettingsSubmenu.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import GlobalData.GlobalDatabase;
import _VisualDVM.Syntax.VisualiserFonts;
import GlobalData.Settings.SettingName;
@@ -13,7 +13,7 @@ public class SettingsSubmenu extends JMenu {
setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
for (SettingName c : settings) {
add(Global.db.settings.get(c).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(c).getMenuItem());
}
}
}