M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2025-01-18 01:36:02 +03:00
parent 69151dd7a8
commit 18b4d58682
47 changed files with 724 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/_VisualDVM/GlobalData/GlobalDatabase.java
View File

@@ -29,7 +29,6 @@ import _VisualDVM.Passes.PassCode;
import java.nio.file.Paths;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Vector;
public class GlobalDatabase extends VisualiserDatabase {
//---------СЕАНС----------------------------------------------
public MachinesDBTable machines;
@@ -89,19 +88,19 @@ public class GlobalDatabase extends VisualiserDatabase {
}
//todo централизованное сохранение текущих объектов в базах
public void SaveCredentials() {
Global.properties.updateField("lastMachineId", getTable(Machine.class).getUI().getCurrentPK(CommonConstants.Nan));
Global.properties.updateField("lastUserId", getTable(User.class).getUI().getCurrentPK(CommonConstants.Nan));
Global.properties.updateField("lastCompilerId", getTable(Compiler.class).getUI().getCurrentPK(CommonConstants.Nan));
Global.normalProperties.updateField("lastMachineId", getTable(Machine.class).getUI().getCurrentPK(CommonConstants.Nan));
Global.normalProperties.updateField("lastUserId", getTable(User.class).getUI().getCurrentPK(CommonConstants.Nan));
Global.normalProperties.updateField("lastCompilerId", getTable(Compiler.class).getUI().getCurrentPK(CommonConstants.Nan));
}
public void RestoreCredentials() {
if (Global.properties.lastMachineId != CommonConstants.Nan) {
getTable(Machine.class).getUI().SetCurrentByPK(Global.properties.lastMachineId);
if (Global.normalProperties.lastMachineId != CommonConstants.Nan) {
getTable(Machine.class).getUI().SetCurrentByPK(Global.normalProperties.lastMachineId);
//-
if (Global.properties.lastUserId != CommonConstants.Nan)
getTable(User.class).getUI().SetCurrentByPK(Global.properties.lastUserId);
if (Global.normalProperties.lastUserId != CommonConstants.Nan)
getTable(User.class).getUI().SetCurrentByPK(Global.normalProperties.lastUserId);
//--
if (Global.properties.lastCompilerId != CommonConstants.Nan)
getTable(Compiler.class).getUI().SetCurrentByPK(Global.properties.lastCompilerId);
if (Global.normalProperties.lastCompilerId != CommonConstants.Nan)
getTable(Compiler.class).getUI().SetCurrentByPK(Global.normalProperties.lastCompilerId);
}
}
//--

2
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
View File

@@ -17,7 +17,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso
}
@Override
protected String getScriptText() {
return Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " 1>out.txt 2>err.txt";
return Utils_.DQuotes(Global.normalProperties.LocalMakePathWindows) + " 1>out.txt 2>err.txt";
}
//скорее всего как то выделить подготовку к компиляции как метод предка.
@Override