рефакторинг. вынес в обобщенную часть бд, но еще не все
This commit is contained in:
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user