From 7eba13370d2c1d1f187878e7fdd7c4235555eca7 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 19 Feb 2025 00:41:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=85=D0=BE=D0=B4=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=83=D1=87=D0=B5?=
 =?UTF-8?q?=D1=82=D0=BD=D0=BE=D0=B9=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8?=
 =?UTF-8?q?=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 18 ++------------
 .../ComponentsServer/ComponentsServer.java    |  7 ++++++
 .../ComponentsServer/CredentialsDatabase.java |  3 ++-
 .../UserAccount/UI/UserAccountsForm.java      |  7 +++++-
 .../Passes/All/EditUserAccount.java           | 24 +++++++++++++++++++
 src/_VisualDVM/Passes/PassCode.java           |  3 +++
 .../Repository/Server/ServerCode.java         |  5 +++-
 7 files changed, 48 insertions(+), 19 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/EditUserAccount.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f5a49204..e287f317 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,27 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeCredentials.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditUserAccount.java" 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/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/AdministrationWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/AdministrationWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/MainWindow.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/ComponentsServer/ComponentsServer.java b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
index c95959ea..6f4b78a0 100644
--- a/src/_VisualDVM/ComponentsServer/ComponentsServer.java
+++ b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
@@ -345,6 +345,10 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     void ReceiveCredentialsDatabase() throws Exception{
         response.object = Utils_.fileToBytes(credentials_db.getFile());
     }
+    void EditUserAccount() throws Exception{
+        UserAccount new_object = (UserAccount) request.object;
+        credentials_db.UpdateWithCheck(new_object);
+    }
     //--
     @Override
     protected void UnsafeSession() throws Exception {
@@ -381,6 +385,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     @Override
     protected void Session() throws Exception {
         switch (code) {
+            case EditUserAccount:
+                EditUserAccount();
+                break;
             case ReceiveCredentialsDatabase:
                 ReceiveCredentialsDatabase();
                 break;
diff --git a/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java b/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
index 6310d251..c6fe49fb 100644
--- a/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
+++ b/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
@@ -2,6 +2,7 @@ package _VisualDVM.ComponentsServer;
 import Common.Database.SQLITE.SQLiteDatabase;
 import Common.Passes.PassCode_;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccountsDBTable;
+import _VisualDVM.Passes.PassCode;
 
 import java.nio.file.Paths;
 public class CredentialsDatabase extends SQLiteDatabase {
@@ -15,7 +16,7 @@ public class CredentialsDatabase extends SQLiteDatabase {
     }
     @Override
     public PassCode_ getSynchronizePassCode() {
-        return null;
+        return PassCode.SynchronizeCredentials;
     }
     @Override
     public void DropUI() {
diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java
index 5e05016d..705290b2 100644
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountsForm.java
@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
+import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
 import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
@@ -49,6 +50,10 @@ public class UserAccountsForm extends DataSetControlForm<UserAccount> {
     }
     @Override
     protected DataMenuBar createMenuBar() {
-        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeCredentials);
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SynchronizeCredentials, PassCode.EditUserAccount);
+    }
+    @Override
+    protected DBObjectDialog getDialog() {
+        return new UserAccountDialog();
     }
 }
diff --git a/src/_VisualDVM/Passes/All/EditUserAccount.java b/src/_VisualDVM/Passes/All/EditUserAccount.java
new file mode 100644
index 00000000..aab337c9
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/EditUserAccount.java
@@ -0,0 +1,24 @@
+package _VisualDVM.Passes.All;
+import Common.Database.Database;
+import Common.Passes.Pass;
+import _VisualDVM.ComponentsServer.ComponentsServer;
+import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
+import _VisualDVM.Passes.Server.EditServerObject;
+import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
+import _VisualDVM.Repository.Server.ServerCode;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
+public class EditUserAccount extends EditServerObject<ComponentsServer,UserAccount> {
+    public EditUserAccount() {
+        super(Global.componentsServer, UserAccount.class);
+    }
+    @Override
+    protected Database getDb() {
+        return Global.componentsServer.credentials_db;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new SafeServerExchangeUnit(ServerCode.EditUserAccount, "", target));
+    }
+}
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index 39339e02..3ad2d5af 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -356,11 +356,14 @@ public enum PassCode implements PassCode_ {
     DetectSelectedTestsMinMaDim,
     ConfirmEmail,
     SynchronizeCredentials,
+    EditUserAccount
     ;
     //--
     @Override
     public String getDescription() {
         switch (this) {
+            case EditUserAccount:
+                return "Редактирование учётной записи";
             case SynchronizeCredentials:
                 return "Синхронизация учётных записей";
             case ConfirmEmail:
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index ff571513..67691185 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -64,9 +64,12 @@ public enum ServerCode {
     ReplaceDVMPackageResults,
     DetectTestsMinMaxDim,
     GetUserAccountByKey,
-    GetUserAccountByEmail;
+    GetUserAccountByEmail,
+    EditUserAccount;
     public String getDescription(){
         switch (this){
+            case EditUserAccount:
+                return "Редактирование учётной записи на сервере";
             case ReceiveCredentialsDatabase:
                 return "Скачивание базы учётных записей с сервера";
             case GetUserAccountByEmail: