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

9
src/GlobalData/RunConfiguration/RunConfiguration.java
View File

@@ -3,7 +3,6 @@ import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
import Common.Utils.TextLog;
import GlobalData.Compiler.Compiler;
import GlobalData.DVMParameter.DVMParameter;
@@ -118,7 +117,7 @@ public class RunConfiguration extends iDBObject {
}
//---------------------------------------->
public Compiler getCompiler() {
return Global.db.getById(Compiler.class, compiler_id);
return CommonUtils.db.getById(Compiler.class, compiler_id);
}
public boolean isCube() {
return cube != 0;
@@ -190,13 +189,13 @@ public class RunConfiguration extends iDBObject {
return "run_configuration_id";
}
public Vector<String> getEnvList() {
return Global.db.getVectorStringByFK(this, EnvironmentValue.class);
return CommonUtils.db.getVectorStringByFK(this, EnvironmentValue.class);
}
public Vector<String> getParList() {
return Global.db.getVectorStringByFK(this, DVMParameter.class);
return CommonUtils.db.getVectorStringByFK(this, DVMParameter.class);
}
public LinkedHashMap<String, String> getEnvMap() {
LinkedHashMap<Integer, EnvironmentValue> envs = Global.db.getMapByFKi(this, EnvironmentValue.class);
LinkedHashMap<Integer, EnvironmentValue> envs = CommonUtils.db.getMapByFKi(this, EnvironmentValue.class);
LinkedHashMap<String, String> res = new LinkedHashMap<>();
for (EnvironmentValue e : envs.values()) {
if (!res.containsKey(e.name))

5
src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -1,8 +1,8 @@
package GlobalData.RunConfiguration;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import _VisualDVM.Global;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
@@ -14,6 +14,7 @@ import GlobalData.Compiler.Compiler;
import GlobalData.Compiler.CompilerType;
import GlobalData.DVMParameter.DVMParameter;
import GlobalData.EnvironmentValue.EnvironmentValue;
import GlobalData.GlobalDatabase;
import GlobalData.RunConfiguration.UI.MatrixBar;
import GlobalData.RunConfiguration.UI.RunConfigurationFields;
import GlobalData.Tasks.RunTask.RunTask;
@@ -39,7 +40,7 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
return new DBObjectDialog<RunConfiguration, RunConfigurationFields>(RunConfigurationFields.class) {
@Override
public void fillFields() {
for (Compiler compiler : Global.db.compilers.Data.values()) {
for (Compiler compiler : ((GlobalDatabase)CommonUtils.db).compilers.Data.values()) {
if (compiler.isVisible() && compiler.type.equals(CompilerType.dvm))
fields.cbLauncherCall.addItem(compiler);
}