рефакторинг. вынес в обобщенную часть бд, но еще не все

This commit is contained in:
2024-10-08 01:30:25 +03:00
parent d0c08a2c7e
commit 18ceb04325
91 changed files with 442 additions and 456 deletions

View File

@@ -1,7 +1,9 @@
package Repository.BugReport;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.rDBObject;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Repository.Component.ComponentType;
import com.sun.org.glassfish.gmbal.Description;
@@ -62,7 +64,7 @@ public class BugReport extends rDBObject {
project_version = version_in;
visualiser_version = Global.visualiser.version;
sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version;
sapfor_settings = Global.db.settings.getSapforSettingsText();
sapfor_settings = ((GlobalDatabase)CommonUtils.db).settings.getSapforSettingsText();
percentage = 0;
description = description_in;
date = new Date().getTime();

View File

@@ -1,4 +1,6 @@
package Repository.Component;
import Common.Utils.CommonUtils;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -74,8 +76,8 @@ public class Visualiser extends Component {
System.exit(0);
}
public File getWorkspace() {
if (!Global.db.settings.get(SettingName.Workspace).toString().isEmpty()) {
File workspace = new File(Global.db.settings.get(SettingName.Workspace).toString());
if (!((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).toString().isEmpty()) {
File workspace = new File(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).toString());
if (workspace.exists())
return workspace;
else