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());
}
}
}

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

@@ -28,6 +28,7 @@ import GlobalData.DVMParameter.DVMParameterDBTable;
import GlobalData.DVMParameter.DVMParametersMenuBar;
import GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
import GlobalData.EnvironmentValue.EnvironmentValuesMenuBar;
import GlobalData.GlobalDatabase;
import GlobalData.Machine.MachinesDBTable;
import GlobalData.Machine.MachinesMenuBar;
import GlobalData.Makefile.MakefilesDBTable;
@@ -92,7 +93,6 @@ import Visual_DVM_2021.UI.Main.DebugForm;
import Visual_DVM_2021.UI.Main.MainForm;
import Visual_DVM_2021.UI.Main.ProfilesForm;
import Visual_DVM_2021.UI.Main.VersionsForm;
import _VisualDVM.Global;
import _VisualDVM.Syntax.*;
import _VisualDVM.Syntax.VisualiserTheme;
@@ -299,7 +299,7 @@ public class UI {
ShowTabsNames(tabs, 0);
}
public static void ShowTabsNames(JTabbedPane tabs, int startIndex) {
boolean flag = Global.db.settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
for (int i = startIndex; i < tabs.getTabCount(); ++i)
tabs.setTitleAt(i, flag ? tabs.getToolTipTextAt(i) : "");
}

10
src/Common_old/UI/Windows/Form.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Windows;
import Common.Utils.CommonUtils;
import _VisualDVM.Global;
import GlobalData.GlobalDatabase;
import _VisualDVM.Syntax.ThemeElement;
import GlobalData.FormsParams.DBForm;
@@ -75,8 +75,8 @@ public abstract class Form extends JFrame implements ThemeElement {
}
public void LoadWindowParameters() throws SQLException, InstantiationException, IllegalAccessException, NoSuchFieldException {
if (!getFormType().equals(FormType.Undefined))
if (Global.db.forms.Data.containsKey(getFormType())) {
info = Global.db.forms.Data.get(getFormType());
if (((GlobalDatabase)CommonUtils.db).forms.Data.containsKey(getFormType())) {
info = ((GlobalDatabase)CommonUtils.db).forms.Data.get(getFormType());
info.Apply(this);
return;
}
@@ -87,9 +87,9 @@ public abstract class Form extends JFrame implements ThemeElement {
if (!getFormType().equals(FormType.Undefined)) {
if (info != null) {
info.Init(this);
Global.db.Update(info);
CommonUtils.db.Update(info);
} else
Global.db.Insert(new DBForm(getFormType(), this));
CommonUtils.db.Insert(new DBForm(getFormType(), this));
}
}
@Override

15
src/Common_old/Utils/Utils.java
View File

@@ -4,6 +4,7 @@ import Common.Utils.Index;
import Common.Utils.StringTemplate;
import Common.Utils.TextLog;
import Common_old.Constants;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Files.VFileChooser_;
@@ -660,7 +661,7 @@ public class Utils {
}
public static void RestoreSelectedDirectory(VFileChooser_ directoryChooser) {
String last_dir_home =
Global.db.settings.get(SettingName.ProjectsSearchDirectory).Value;
((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ProjectsSearchDirectory).Value;
if (!last_dir_home.isEmpty())
directoryChooser.SetCurrentDirectory(last_dir_home);
}
@@ -708,11 +709,11 @@ public class Utils {
break;
case ' ':
case '\t':
if (Global.db.settings.get(SettingName.SpacesOn).toBoolean()) line.append(c);
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SpacesOn).toBoolean()) line.append(c);
v_line.append(c);
break;
case '\n': //конец строки
if (Global.db.settings.get(SettingName.FortranWrapsOn).toBoolean()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FortranWrapsOn).toBoolean()) {
//оракул. лезем в начало следующей строки
//и анализируем первые 5 символов
boolean hasWrap = false;
@@ -738,7 +739,7 @@ public class Utils {
break;
}
//добавление строки в результат.
if ((line.length() > 0) || Global.db.settings.get(SettingName.EmptyLinesOn).toBoolean()
if ((line.length() > 0) || ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.EmptyLinesOn).toBoolean()
// Global.db.settings.get(SettingName.SpacesOn).toBoolean()
) {
lines.add(line.toString());
@@ -757,7 +758,7 @@ public class Utils {
if ((i > 0) && (c != '\n')) {
//строка оборвалась на EOF
//добавление строки в результат.
if ((line.length() > 0) || Global.db.settings.get(SettingName.EmptyLinesOn).toBoolean()
if ((line.length() > 0) ||((GlobalDatabase)CommonUtils.db).settings.get(SettingName.EmptyLinesOn).toBoolean()
// && Global.db.settings.get(SettingName.SpacesOn).toBoolean()
) {
lines.add(line.toString());
@@ -769,11 +770,11 @@ public class Utils {
public static boolean CompareLines(String line1_raw, String line2_raw) {
String line1 = line1_raw;
String line2 = line2_raw;
if (!Global.db.settings.get(SettingName.RegisterOn).toBoolean()) {
if (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.RegisterOn).toBoolean()) {
line1 = line1.toUpperCase();
line2 = line2.toUpperCase();
}
if (!Global.db.settings.get(SettingName.SpacesOn).toBoolean()) {
if (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SpacesOn).toBoolean()) {
line1 = CommonUtils.removeCharacters(line1, " ", "\t");
line2 = CommonUtils.removeCharacters(line2, " ", "\t");
}