From d7ea2f862e08ab8e1f689678da3f2046dc3b468f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 25 Feb 2025 14:17:23 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D1=80=D1=8B=D1=82=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=83=D1=8F=D0=B7=D0=B2=D0=B8=D0=BC=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=20=D1=81=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=D0=BC=D0=B8=20?=
 =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=20v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 10 ++++++-
 properties                                    |  2 +-
 .../ComponentsServer/ComponentsServer.java    |  2 +-
 src/_VisualDVM/Constants.java                 |  2 +-
 .../Passes/All/CreateTestFromDirectory.java   |  6 -----
 .../Passes/All/CreateTestFromProject.java     | 27 ++++++++++++++-----
 .../CreateTestsGroupFromSelectedVersions.java |  2 +-
 .../Common/Test/UI/TestDialog.java            |  3 +++
 8 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b33736f9..9680db39 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,15 @@
     </artifacts-to-build>
   </component>
   <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$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.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/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/properties b/properties
index 1fcb6f95..b9614898 100644
--- a/properties
+++ b/properties
@@ -3,7 +3,7 @@
   "Name": "M",
   "ServerUserPassword": "mprit_2011",
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\236",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/_VisualDVM/ComponentsServer/ComponentsServer.java b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
index 870b65f4..38468e77 100644
--- a/src/_VisualDVM/ComponentsServer/ComponentsServer.java
+++ b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
@@ -377,7 +377,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 GetComponentsBackUps();
                 break;
             case UpdateComponent:
-                //возможно со стороны админа ввод подтверждения по почте запрашивать.
+                //zip
                 PublishComponent();
                 break;
             case ReceiveComponent:
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index b1dc3760..ebe81f68 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1184;
+    public static final int version = 1185;
     public static final int planner_version = 10;
     public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
     //--
diff --git a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
index 67639a24..280e6e34 100644
--- a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
@@ -197,13 +197,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
     @Override
     protected void body() throws Exception {
         ShowMessage1(dir.getName());
-        //--
         File tempProject = packTestCode(); //создание копии папки, и архивация.
-        //-- получить размерность консольным сапфором. папка уже отправлена и чистить ее не нужно!!
-        ShowMessage2("Синтаксический анализ и определение размерности");
-        if (group.language == LanguageName.fortran) {//если не определит, будут нули.
-            Sapfor.getMinMaxDim(Sapfor.getTempCopy(Global.mainModule.getSapfor().getFile()), tempProject, target);
-        }
     }
     @Override
     protected boolean validate() {
diff --git a/src/_VisualDVM/Passes/All/CreateTestFromProject.java b/src/_VisualDVM/Passes/All/CreateTestFromProject.java
index 0210c5ef..f01b5453 100644
--- a/src/_VisualDVM/Passes/All/CreateTestFromProject.java
+++ b/src/_VisualDVM/Passes/All/CreateTestFromProject.java
@@ -4,6 +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;
@@ -13,15 +14,27 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        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;
+        if (args.length == 0) {
+            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;
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
index 0229d842..558a77a7 100644
--- a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -22,7 +22,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
         //---
-        if (Global.testingServer.db.groups.getUI().CheckCurrent(Log)) {
+        if (Global.testingServer.db.groups.getUI().canModifyCurrent(Log)) {
             group = Global.testingServer.db.groups.getUI().getCurrent();
         } else
             return false;
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
index 3df1c4d1..013e9b09 100644
--- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
+++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
@@ -1,8 +1,10 @@
 package _VisualDVM.TestingSystem.Common.Test.UI;
+import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.Global;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Test.Test;
+import _VisualDVM.Utils;
 public class TestDialog extends DBObjectDialog<Test, TestFields> {
     public TestDialog() {
         super(TestFields.class);
@@ -23,6 +25,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
                         +
                         Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language);
         }
+        Utils.validateFileShortNewName(fields.tfName.getText(),Log);
     }
     @Override
     public void fillFields() {