From f7973e0991f4275ce0df7ca5501344df296a68ec Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 22 Feb 2025 15:18:22 +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=BD=D0=B0=D1=88?=
 =?UTF-8?q?=D0=B5=D0=BB=20=D0=B5=D1=89=D0=B5=20=D0=BD=D0=B5=D1=81=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D1=83=D1=8F=D0=B7=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=BE=D1=81=D1=82=D0=B5=D0=B9=20=D0=B2=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D1=87=D1=83=D0=B6=D0=B8=D1=85=20=D0=BE=D0=B1=D1=8A?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BE=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 31 ++++++-------------
 properties                                    | 10 +++---
 src/Common/Database/Objects/riDBObject.java   |  2 ++
 src/Common/Visual/DataSetControlForm.java     |  7 +++++
 .../Passes/All/CreateTestFromDirectory.java   |  3 +-
 .../Passes/All/CreateTestFromProject.java     | 28 +++++------------
 .../Passes/All/CreateTestsFromFiles.java      |  2 +-
 .../All/DetectSelectedTestsMinMaDim.java      | 11 ++++---
 .../Passes/All/ReplaceTestProject.java        |  1 +
 .../Passes/All/ReplaceTestsFromFiles.java     |  2 +-
 .../Testing/SaveCurrentConfiguration.java     |  2 +-
 .../Common/Group/GroupsDBTable.java           |  2 ++
 .../Common/Group/UI/GroupsForm.java           |  1 +
 13 files changed, 48 insertions(+), 54 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6fbdc8a5..c6b0ccc9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,29 +7,18 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachinesDatabase.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Visualizer_2.exe" beforeDir="false" afterPath="$PROJECT_DIR$/Visualizer_2.exe" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.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/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PauseDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PauseDVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResumeDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResumeDVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.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/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ShutdownServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ShutdownServerPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/StartServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/StartServerPass.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/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.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/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/riDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/riDBObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index ce854a35..48c1f17c 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
 {
-  "Email": "vmk-post@yandex.ru",
-  "Name": "M",
+  "Email": "nataliku2@yandex.ru",
+  "Name": "Test",
   "ServerUserPassword": "mprit_2011",
   "Workspace": "E:\\Tests",
   "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
@@ -26,9 +26,9 @@
   "CheckTestingIntervalSeconds": 10,
   "AutoCheckTesting": true,
   "EmailOnTestingProgress": true,
-  "lastMachineId": 13,
-  "lastUserId": 34,
-  "lastCompilerId": 52,
+  "lastMachineId": 7,
+  "lastUserId": -1,
+  "lastCompilerId": -1,
   "RegisterOn": false,
   "SpacesOn": false,
   "EmptyLinesOn": false,
diff --git a/src/Common/Database/Objects/riDBObject.java b/src/Common/Database/Objects/riDBObject.java
index dc931301..597555ee 100644
--- a/src/Common/Database/Objects/riDBObject.java
+++ b/src/Common/Database/Objects/riDBObject.java
@@ -1,8 +1,10 @@
 package Common.Database.Objects;
 public class riDBObject extends iDBObject {
     //-
+    //todo int useraccount_id по объекту аккаунтов. сюда и права. и проверку их.
     public String sender_name = "";
     public String sender_address = "";
+    //---
     public String description = "";
     //-
     @Override
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 3db3bcfe..613ae9d3 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -2,6 +2,7 @@ package Common.Visual;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.Grid.TableVisualData;
+import Common.Database.Objects.riDBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DataSet;
 import Common.Database.Tables.FKBehaviour;
@@ -14,6 +15,7 @@ import Common.Visual.Menus.TableMenu;
 import Common.Visual.Tables.*;
 import Common.Visual.Tables.Grid.GridAnchestor;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
+import _VisualDVM.Global;
 
 import javax.swing.*;
 import javax.swing.table.TableColumn;
@@ -575,4 +577,9 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
     public Object getCurrentPK(Object nanValue){
         return current==null? nanValue: current.getPK();
     }
+    //todo временное решение ? ->>>
+    public boolean canModifyCurrent(TextLog Log){
+        return CheckCurrent(Log) && (
+                !(current instanceof riDBObject) || Global.mainModule.getAccount().CheckAuthorship(((riDBObject)current).sender_address,Log));
+    }
 }
diff --git a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
index 2c55e76d..67639a24 100644
--- a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
@@ -69,8 +69,9 @@ public class CreateTestFromDirectory extends Pass<Test> {
         if (args.length == 0) {
             //--
             from_files_chooser = true;
-            if (!Global.testingServer.db.groups.getUI().CheckCurrent(Log))
+            if (!Global.testingServer.db.groups.getUI().canModifyCurrent(Log)) {
                 return false;
+            }
             group = Global.testingServer.db.groups.getUI().getCurrent();
             if (!selectFiles())
                 return false;
diff --git a/src/_VisualDVM/Passes/All/CreateTestFromProject.java b/src/_VisualDVM/Passes/All/CreateTestFromProject.java
index 71b05452..0210c5ef 100644
--- a/src/_VisualDVM/Passes/All/CreateTestFromProject.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromProject.java
@@ -4,8 +4,7 @@ import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.FileState;
 import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.Project.db_project_info;
-import _VisualDVM.TestingSystem.Common.Group.Group;
-//из текущего проекта.
+//добавить в текущую группу новый тест из текущего проекта.
 public class CreateTestFromProject extends CreateTestFromDirectory {
     db_project_info project;
     @Override
@@ -14,25 +13,14 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (args.length == 0) {
-            if (Global.testingServer.db.groups.getUI().CheckCurrent(Log) && Global.mainModule.Check(Log, Current.Project)) {
-                project = Global.mainModule.getProject();
-                if (super.canStart(
-                        project.Home,
-                        Global.testingServer.db.groups.getUI().getCurrent())) {
-                    from_files_chooser = true; //чтобы опубликовал.
-                    return true;
-                }
+        if (Global.testingServer.db.groups.getUI().canModifyCurrent(Log) && Global.mainModule.Check(Log, Current.Project)) {
+            project = Global.mainModule.getProject();
+            if (super.canStart(
+                    project.Home,
+                    Global.testingServer.db.groups.getUI().getCurrent())) {
+                from_files_chooser = true; //чтобы опубликовал.
+                return true;
             }
-        } else {
-            project = (db_project_info) args[0];
-            group = (Group) args[1];
-            //если проект не текущий, освежить его бд.
-            if (!Global.mainModule.HasProject() || !Global.mainModule.getProject().Home.equals(project.Home)) {
-                project.Open();
-                project.Close();
-            }
-            return super.canStart(project.Home, group);
         }
         return false;
     }
diff --git a/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java b/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
index db1648ee..6d20b84f 100644
--- a/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
+++ b/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
@@ -18,7 +18,7 @@ public class CreateTestsFromFiles extends PublishTests {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Global.testingServer.db.groups.getUI().CheckCurrent(Log)) {
+        if (Global.testingServer.db.groups.getUI().canModifyCurrent(Log)) {
             Utils.RestoreSelectedDirectory(fileChooser);
             Vector<File> files = fileChooser.ShowMultiDialog();
             if (files.isEmpty()) {
diff --git a/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java b/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java
index 89a5717a..0fa754b4 100644
--- a/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java
+++ b/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java
@@ -12,10 +12,13 @@ public class DetectSelectedTestsMinMaDim extends TestingServerPass<Vector<Object
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!Global.testingServer.db.tests.getUI().CheckSelectedOrCurrent(Log))
-            return false;
-        target=Global.testingServer.db.tests.getUI().getSelectedOrCurrentKeys();
-        return SendRequest(ServerCode.DetectTestsMinMaxDim, "",target);
+        if (Global.testingServer.db.groups.getUI().canModifyCurrent(Log)) {
+            if (!Global.testingServer.db.tests.getUI().CheckSelectedOrCurrent(Log))
+                return false;
+            target = Global.testingServer.db.tests.getUI().getSelectedOrCurrentKeys();
+            return SendRequest(ServerCode.DetectTestsMinMaxDim, "", target);
+        }
+        return false;
     }
     @Override
     protected void performDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/ReplaceTestProject.java b/src/_VisualDVM/Passes/All/ReplaceTestProject.java
index ee9f9511..d39a84a3 100644
--- a/src/_VisualDVM/Passes/All/ReplaceTestProject.java
+++ b/src/_VisualDVM/Passes/All/ReplaceTestProject.java
@@ -5,6 +5,7 @@ import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 
 import java.io.Serializable;
+//заменить текущий тест на текущий проект.
 public class ReplaceTestProject extends CreateTestFromProject {
     @Override
     public String getIconPath() {
diff --git a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
index 246f2ac9..e69fbac0 100644
--- a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
@@ -30,7 +30,7 @@ public class ReplaceTestsFromFiles extends TestingServerPass<Vector<Test>> {
     //-
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!Global.testingServer.db.groups.getUI().CheckCurrent(Log))
+        if (!Global.testingServer.db.groups.getUI().canModifyCurrent(Log))
             return false;
         group = Global.testingServer.db.groups.getUI().getCurrent();
         //--->>>
diff --git a/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java b/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
index 3eb94cac..9a0525a7 100644
--- a/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
+++ b/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
@@ -29,7 +29,7 @@ public abstract class SaveCurrentConfiguration<C extends Configuration, S extend
     protected abstract Class currentClass();
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (!Global.testingServer.db.getTable(currentClass()).getUI().CheckCurrent(Log)) return false;
+        if (!Global.testingServer.db.getTable(currentClass()).getUI().canModifyCurrent(Log)) return false;
         target = (C) Global.testingServer.db.getTable(currentClass()).getUI().getCurrent();
         //--
         groups = new Vector<>();
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
index 6d1bf811..be7e0fd4 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
@@ -5,6 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
 import Common.Database.Tables.FKDataBehaviour;
 import Common.Database.Tables.iDBTable;
 import Common.Visual.DataSetControlForm;
+import _VisualDVM.Global;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
 import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -50,4 +51,5 @@ public class GroupsDBTable extends iDBTable<Group> {
         }
         return null;
     }
+  //  CheckCurrent(Log) && Global.mainModule.getAccount().CheckAuthorship(getCurrent().sender_address, Log);
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
index 429a6565..167d5fb2 100644
--- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
+++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
@@ -1,6 +1,7 @@
 package _VisualDVM.TestingSystem.Common.Group.UI;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
+import Common.Utils.TextLog;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.Controls.StableMenuItem;
 import Common.Visual.DataSetControlForm;