удаление устаревшего объекта
This commit is contained in:
6
.idea/workspace.xml
generated
6
.idea/workspace.xml
generated
@@ -7,8 +7,12 @@
|
|||||||
</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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Current.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Credentials/Credentials.java" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.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" />
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
"collapseProjectTrees": false,
|
"collapseProjectTrees": false,
|
||||||
"BackupWorkspace": "_sapfor_x64_backups",
|
"BackupWorkspace": "_sapfor_x64_backups",
|
||||||
"Workspace": "E:\\Tests",
|
"Workspace": "E:\\Tests",
|
||||||
"ProjectsSearchDirectory": "E:\\Workspace",
|
"ProjectsSearchDirectory": "E:\\BUG",
|
||||||
"EditorFontSize": 17,
|
"EditorFontSize": 17,
|
||||||
"BackupHour": 5,
|
"BackupHour": 5,
|
||||||
"BackupMinute": 0,
|
"BackupMinute": 0,
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
"InstructionPath": "",
|
"InstructionPath": "",
|
||||||
"PerformanceAnalyzerPath": "",
|
"PerformanceAnalyzerPath": "",
|
||||||
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
||||||
"Kernels": 4,
|
"Kernels": 8,
|
||||||
"ComponentsBackUpsCount": 10,
|
"ComponentsBackUpsCount": 10,
|
||||||
"AutoCheckTesting": true,
|
"AutoCheckTesting": true,
|
||||||
"CheckTestingIntervalSeconds": 10,
|
"CheckTestingIntervalSeconds": 10,
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public enum Current implements Current_ {
|
|||||||
Function,
|
Function,
|
||||||
SelectedFunction,
|
SelectedFunction,
|
||||||
//-
|
//-
|
||||||
ProjectView, Credentials;
|
ProjectView;
|
||||||
@Override
|
@Override
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
switch (this) {
|
switch (this) {
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
package _VisualDVM.GlobalData.Credentials;
|
|
||||||
import Common.CommonConstants;
|
|
||||||
import Common.Database.Objects.iDBObject;
|
|
||||||
import com.sun.org.glassfish.gmbal.Description;
|
|
||||||
//todo вывести. оформить механизм сохр текущих объектов в бд визуализатора.
|
|
||||||
public class Credentials extends iDBObject {
|
|
||||||
@Description("DEFAULT -1")
|
|
||||||
public int machine_id = CommonConstants.Nan;
|
|
||||||
@Description("DEFAULT -1")
|
|
||||||
public int user_id = CommonConstants.Nan;
|
|
||||||
@Description("DEFAULT -1")
|
|
||||||
public int compiler_id = CommonConstants.Nan;
|
|
||||||
@Description("DEFAULT -1")
|
|
||||||
public int makefile_id = CommonConstants.Nan;
|
|
||||||
@Description("DEFAULT -1")
|
|
||||||
public int runconfiguration_id = CommonConstants.Nan;
|
|
||||||
@Description("DEFAULT -1")
|
|
||||||
public int remotesapfor_id = CommonConstants.Nan;
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package _VisualDVM.GlobalData.Credentials;
|
|
||||||
import Common.Database.Tables.iDBTable;
|
|
||||||
//todo реализовать стандартно для выбранных объектов (?)
|
|
||||||
public class CredentialsDBTable extends iDBTable<Credentials> {
|
|
||||||
public CredentialsDBTable() {
|
|
||||||
super(Credentials.class);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -8,8 +8,6 @@ import _VisualDVM.GlobalData.Account.Account;
|
|||||||
import _VisualDVM.GlobalData.Account.AccountsDBTable;
|
import _VisualDVM.GlobalData.Account.AccountsDBTable;
|
||||||
import _VisualDVM.GlobalData.Compiler.Compiler;
|
import _VisualDVM.GlobalData.Compiler.Compiler;
|
||||||
import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
|
import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
|
||||||
import _VisualDVM.GlobalData.Credentials.Credentials;
|
|
||||||
import _VisualDVM.GlobalData.Credentials.CredentialsDBTable;
|
|
||||||
import _VisualDVM.GlobalData.DBLastProject.LastProjectsDBTable;
|
import _VisualDVM.GlobalData.DBLastProject.LastProjectsDBTable;
|
||||||
import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
|
import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
|
||||||
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
|
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
|
||||||
@@ -44,7 +42,6 @@ public class GlobalDatabase extends VisualiserDatabase {
|
|||||||
public RunConfigurationsDBTable runConfigurations;
|
public RunConfigurationsDBTable runConfigurations;
|
||||||
public EnvironmentValuesDBTable environmentValues;
|
public EnvironmentValuesDBTable environmentValues;
|
||||||
public DVMParameterDBTable dvmParameters;
|
public DVMParameterDBTable dvmParameters;
|
||||||
public CredentialsDBTable credentials;
|
|
||||||
//----- ДАННЫЕ ВИЗУАЛИЗАТОРА---------------------------------
|
//----- ДАННЫЕ ВИЗУАЛИЗАТОРА---------------------------------
|
||||||
public LastProjectsDBTable lastProjects;
|
public LastProjectsDBTable lastProjects;
|
||||||
public AccountsDBTable accounts;
|
public AccountsDBTable accounts;
|
||||||
@@ -68,7 +65,6 @@ public class GlobalDatabase extends VisualiserDatabase {
|
|||||||
addTable(runTasks = new RunTasksDBTable());
|
addTable(runTasks = new RunTasksDBTable());
|
||||||
addTable(runConfigurations = new RunConfigurationsDBTable());
|
addTable(runConfigurations = new RunConfigurationsDBTable());
|
||||||
addTable(environmentValues = new EnvironmentValuesDBTable());
|
addTable(environmentValues = new EnvironmentValuesDBTable());
|
||||||
addTable(credentials = new CredentialsDBTable());
|
|
||||||
addTable(lastProjects = new LastProjectsDBTable());
|
addTable(lastProjects = new LastProjectsDBTable());
|
||||||
addTable(accounts = new AccountsDBTable());
|
addTable(accounts = new AccountsDBTable());
|
||||||
addTable(dvmParameters = new DVMParameterDBTable());
|
addTable(dvmParameters = new DVMParameterDBTable());
|
||||||
@@ -82,9 +78,6 @@ public class GlobalDatabase extends VisualiserDatabase {
|
|||||||
accounts.Data.isEmpty() ? Insert(new Account()) :
|
accounts.Data.isEmpty() ? Insert(new Account()) :
|
||||||
accounts.getFirstRecord()
|
accounts.getFirstRecord()
|
||||||
);
|
);
|
||||||
Global.mainModule.set(Current.Credentials,
|
|
||||||
credentials.Data.isEmpty() ? Insert(new Credentials()) :
|
|
||||||
credentials.getFirstRecord());
|
|
||||||
//настройки компонент
|
//настройки компонент
|
||||||
runConfigurations.Patch();
|
runConfigurations.Patch();
|
||||||
//---
|
//---
|
||||||
|
|||||||
Reference in New Issue
Block a user