From 69151dd7a8d8ec19cbc7d440a0a3ce77c7a755c5 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 17 Jan 2025 18:11:32 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B5?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  6 +++++-
 properties                                    |  4 ++--
 src/_VisualDVM/Current.java                   |  2 +-
 .../GlobalData/Credentials/Credentials.java   | 19 -------------------
 .../Credentials/CredentialsDBTable.java       |  8 --------
 src/_VisualDVM/GlobalData/GlobalDatabase.java |  7 -------
 6 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 src/_VisualDVM/GlobalData/Credentials/Credentials.java
 delete mode 100644 src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1aafc932..027243ea 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <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$/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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 98064a7b..ebc4e0b6 100644
--- a/properties
+++ b/properties
@@ -16,7 +16,7 @@
   "collapseProjectTrees": false,
   "BackupWorkspace": "_sapfor_x64_backups",
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Workspace",
+  "ProjectsSearchDirectory": "E:\\BUG",
   "EditorFontSize": 17,
   "BackupHour": 5,
   "BackupMinute": 0,
@@ -38,7 +38,7 @@
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
   "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
-  "Kernels": 4,
+  "Kernels": 8,
   "ComponentsBackUpsCount": 10,
   "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
diff --git a/src/_VisualDVM/Current.java b/src/_VisualDVM/Current.java
index 6c07f8c9..68934689 100644
--- a/src/_VisualDVM/Current.java
+++ b/src/_VisualDVM/Current.java
@@ -28,7 +28,7 @@ public enum Current implements Current_ {
     Function,
     SelectedFunction,
     //-
-    ProjectView, Credentials;
+    ProjectView;
     @Override
     public String getDescription() {
         switch (this) {
diff --git a/src/_VisualDVM/GlobalData/Credentials/Credentials.java b/src/_VisualDVM/GlobalData/Credentials/Credentials.java
deleted file mode 100644
index 57a8bcd0..00000000
--- a/src/_VisualDVM/GlobalData/Credentials/Credentials.java
+++ /dev/null
@@ -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;
-}
diff --git a/src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java b/src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java
deleted file mode 100644
index e5b5f4eb..00000000
--- a/src/_VisualDVM/GlobalData/Credentials/CredentialsDBTable.java
+++ /dev/null
@@ -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);
-    }
-}
diff --git a/src/_VisualDVM/GlobalData/GlobalDatabase.java b/src/_VisualDVM/GlobalData/GlobalDatabase.java
index 95c2b941..738259f8 100644
--- a/src/_VisualDVM/GlobalData/GlobalDatabase.java
+++ b/src/_VisualDVM/GlobalData/GlobalDatabase.java
@@ -8,8 +8,6 @@ import _VisualDVM.GlobalData.Account.Account;
 import _VisualDVM.GlobalData.Account.AccountsDBTable;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
-import _VisualDVM.GlobalData.Credentials.Credentials;
-import _VisualDVM.GlobalData.Credentials.CredentialsDBTable;
 import _VisualDVM.GlobalData.DBLastProject.LastProjectsDBTable;
 import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable;
 import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable;
@@ -44,7 +42,6 @@ public class GlobalDatabase extends VisualiserDatabase {
     public RunConfigurationsDBTable runConfigurations;
     public EnvironmentValuesDBTable environmentValues;
     public DVMParameterDBTable dvmParameters;
-    public CredentialsDBTable credentials;
     //----- ДАННЫЕ ВИЗУАЛИЗАТОРА---------------------------------
     public LastProjectsDBTable lastProjects;
     public AccountsDBTable accounts;
@@ -68,7 +65,6 @@ public class GlobalDatabase extends VisualiserDatabase {
         addTable(runTasks = new RunTasksDBTable());
         addTable(runConfigurations = new RunConfigurationsDBTable());
         addTable(environmentValues = new EnvironmentValuesDBTable());
-        addTable(credentials = new CredentialsDBTable());
         addTable(lastProjects = new LastProjectsDBTable());
         addTable(accounts = new AccountsDBTable());
         addTable(dvmParameters = new DVMParameterDBTable());
@@ -82,9 +78,6 @@ public class GlobalDatabase extends VisualiserDatabase {
                 accounts.Data.isEmpty() ? Insert(new Account()) :
                         accounts.getFirstRecord()
         );
-        Global.mainModule.set(Current.Credentials,
-                credentials.Data.isEmpty() ? Insert(new Credentials()) :
-                        credentials.getFirstRecord());
         //настройки компонент
         runConfigurations.Patch();
         //---