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

fix. во время переноса вкладок с компиляцией и запуском сбил сохранение текущиъ машины пользователя и компилятора

Browse Source
This commit is contained in:
02090095
2023-12-05 00:40:08 +03:00
parent f6bf044060
commit a6a29e913a
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -7,10 +7,10 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/DebugForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

31
src/GlobalData/GlobalDatabase.java
View File

@@ -108,19 +108,24 @@ public class GlobalDatabase extends SQLiteDatabase {
public PassCode_2021 getSynchronizePassCode() { public PassCode_2021 getSynchronizePassCode() {
return null; return null;
} }
public void SaveCredentials() throws Exception { public void SaveCredentials(){
Credentials credentials = (Credentials) Current.get(Current.Credentials); try {
if (Current.HasMachine()) Credentials credentials = (Credentials) Current.get(Current.Credentials);
credentials.machine_id = Current.getMachine().id; if (Current.HasMachine())
if (Current.HasUser()) credentials.machine_id = Current.getMachine().id;
credentials.user_id = Current.getUser().id; if (Current.HasUser())
if (Current.HasCompiler()) credentials.user_id = Current.getUser().id;
credentials.compiler_id = Current.getCompiler().id; if (Current.HasCompiler())
if (Current.HasMakefile()) credentials.compiler_id = Current.getCompiler().id;
credentials.makefile_id = Current.getMakefile().id; if (Current.HasMakefile())
if (Current.HasRunConfiguration()) credentials.makefile_id = Current.getMakefile().id;
credentials.runconfiguration_id = Current.getRunConfiguration().id; if (Current.HasRunConfiguration())
Update(credentials); credentials.runconfiguration_id = Current.getRunConfiguration().id;
Update(credentials);
}
catch (Exception ex){
ex.printStackTrace();
}
} }
public void UpdateCredentials() { public void UpdateCredentials() {
try { try {

9
src/Visual_DVM_2021/UI/Main/DebugForm.java
View File

@@ -37,15 +37,6 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
return content; return content;
} }
@Override @Override
public void SaveSplitters() {
FormWithSplitters.super.SaveSplitters();
try {
Global.db.SaveCredentials();
} catch (Exception ex) {
Global.Log.PrintException(ex);
}
}
@Override
public void DropRunTasksComparison() { public void DropRunTasksComparison() {
singleRunTaskMaster.RemoveObject(); singleRunTaskMaster.RemoveObject();
singleRunTaskSlave.RemoveObject(); singleRunTaskSlave.RemoveObject();

2
src/Visual_DVM_2021/UI/Main/MainForm.java
View File

@@ -62,6 +62,8 @@ public class MainForm extends Form implements MainWindow {
if (UI.debugWindow != null) if (UI.debugWindow != null)
((FormWithSplitters) UI.debugWindow).SaveSplitters(); ((FormWithSplitters) UI.debugWindow).SaveSplitters();
//-- //--
Global.db.SaveCredentials();
//--
Global.FinishApplication(); Global.FinishApplication();
} }
public MainForm() { public MainForm() {