M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

исправил внесенные баги, связанные с созданием тестов из версий проекта.

Browse Source
This commit is contained in:
02090095
2023-11-20 00:15:22 +03:00
parent 928705e018
commit b9132782eb
19 changed files with 114 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
.idea/workspace.xml generated
View File

@@ -7,29 +7,25 @@
</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 afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <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/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/RunTask/RunTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksDatabase.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriber.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTaskInterface.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSelectedPackages.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SwitchTestingEmail.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.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" />

1
src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
View File

@@ -13,6 +13,7 @@ public interface MainWindow {
void ShowUpdatesIcon(); void ShowUpdatesIcon();
void FocusProject(); void FocusProject();
void FocusCallback(); void FocusCallback();
void FocusTests();
void FocusTesting(); void FocusTesting();
void ShowTestingTab(); void ShowTestingTab();

1
src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
View File

@@ -6,6 +6,7 @@ public class TestsMenuBar extends DataMenuBar {
super("тесты", super("тесты",
PassCode_2021.DownloadTest, PassCode_2021.DownloadTest,
PassCode_2021.PublishTest, PassCode_2021.PublishTest,
PassCode_2021.CreateTestFromDirectory,
PassCode_2021.EditTest, PassCode_2021.EditTest,
PassCode_2021.DeleteTest); PassCode_2021.DeleteTest);
} }

20
src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java Normal file
View File

@@ -0,0 +1,20 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.Files.VDirectoryChooser;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.Pass_2021;
public class CreateTestFromDirectory extends Pass_2021<Test> {
VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор домашней папки теста");
@Override
public String getIconPath() {
return "/icons/OpenProject.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean needsAnimation() {
return true;
}
}

64
src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
View File

@@ -1,19 +1,18 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Constants;
import Common.Current; import Common.Current;
import Common.Global; import Common.Global;
import Common.UI.UI; import Common.UI.UI;
import Common.Utils.Utils; import Common.Utils.Utils;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType; import TestingSystem.Common.Test.TestType;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
import java.util.Vector; import java.util.Vector;
public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_project_info>> { public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_project_info>> {
Group group; int group_id;
Test test; int test_id;
@Override @Override
protected boolean needsAnimation() { protected boolean needsAnimation() {
return true; return true;
@@ -28,6 +27,8 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
} }
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
group_id = Constants.Nan;
test_id = Constants.Nan;
if (!Current.getAccount().CheckRegistered(Log)) if (!Current.getAccount().CheckRegistered(Log))
return false; return false;
if (!Global.versions_multiselection) { if (!Global.versions_multiselection) {
@@ -35,8 +36,6 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
return false; return false;
} }
target = new Vector<>(); target = new Vector<>();
group = null;
test = null;
Current.getRoot().getSelectedVersions(target); Current.getRoot().getSelectedVersions(target);
if (target.size() == 0) { if (target.size() == 0) {
Log.Writeln_("Не отмечено ни одной версии."); Log.Writeln_("Не отмечено ни одной версии.");
@@ -87,7 +86,7 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
}; };
ShowMessage1("Публикация группы "); ShowMessage1("Публикация группы ");
if (publishGroup.Do()) { if (publishGroup.Do()) {
group = publishGroup.target; group_id = (int) publishGroup.pk;
for (db_project_info vizTestProject : target) { for (db_project_info vizTestProject : target) {
//на случай если версия в текущем сеансе еще не открывалась. //на случай если версия в текущем сеансе еще не открывалась.
vizTestProject.Open(); vizTestProject.Open();
@@ -99,18 +98,25 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
return false; return false;
} }
@Override @Override
public boolean fillObjectFields() throws Exception { public boolean setProject() {
project = vizTestProject; project = vizTestProject;
if (project.checkSubdirectories(Log)) { return true;
}
@Override
public boolean fillObjectFields() throws Exception {
if (setProject() && project.checkSubdirectories(Log)) {
target.description = project.getLocalName() + " " + project.description;
target.group_id = group_id;
switch (project.languageName) { switch (project.languageName) {
case fortran: case fortran:
project.testMaxDim = Current.getSapfor().getTextMaxDim(null, project); target.dim = Current.getSapfor().getTextMaxDim(null, project);
break;
default:
project.testMaxDim = 0;
break;
}
return true; return true;
case c:
target.dim = Utils.getCProjectMaxDim(project);
return true;
default:
return false;
}
} }
return false; return false;
} }
@@ -118,19 +124,31 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
public String getDescription() { public String getDescription() {
return "Добавление версии " + vizTestProject.name; return "Добавление версии " + vizTestProject.name;
} }
}; @Override
if (pass.Do()) protected void performDone() throws Exception {
test = pass.target; test_id = (int) pk;
} }
if (passes.get(PassCode_2021.SynchronizeTests).Do()) { @Override
if (group != null) Global.testingServer.db.groups.ui_.Show(group.getPK()); protected void showDone() throws Exception {
if (test != null) Global.testingServer.db.tests.ui_.Show(test.getPK()); }
};
if (!pass.Do()) return;
} }
} }
} }
@Override @Override
protected void performFinish() throws Exception {
super.performDone();
passes.get(PassCode_2021.SynchronizeTests).Do();
}
@Override
protected void showDone() throws Exception {
super.showDone();
Global.testingServer.db.groups.ui_.Show(group_id);
Global.testingServer.db.tests.ui_.Show(test_id);
}
@Override
protected void FocusResult() { protected void FocusResult() {
UI.getMainWindow().FocusTesting(); UI.getMainWindow().FocusTests();
UI.getMainWindow().getTestingWindow().FocusTestingSystem();
} }
} }

18
src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java
View File

@@ -1,20 +1,10 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Database.Database;
import Common.Global; import Common.Global;
import Repository.Server.ComponentsServer;
import Repository.Subscribes.Subscriber; import Repository.Subscribes.Subscriber;
import Visual_DVM_2021.Passes.DeleteObjectPass; import Visual_DVM_2021.Passes.Server.DeleteServerObject;
import Visual_DVM_2021.Passes.PassCode_2021; public class DeleteSubscriber extends DeleteServerObject<ComponentsServer,Subscriber> {
public class DeleteSubscriber extends DeleteObjectPass<Subscriber> {
public DeleteSubscriber() { public DeleteSubscriber() {
super(Subscriber.class); super(Global.componentsServer, Subscriber.class);
}
@Override
protected Database getDb() {
return Global.componentsServer.db;
}
@Override
protected void performDone() throws Exception {
super.performDone();
passes.get(PassCode_2021.DeleteSubscriberOnServer).Do(target);
} }
} }

22
src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java
View File

@@ -1,22 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import Repository.Subscribes.Subscriber;
import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
import Visual_DVM_2021.Passes.PassCode_2021;
public class DeleteSubscriberOnServer extends ComponentsRepositoryPass<Subscriber> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (Subscriber) args[0];
return true;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.DeleteObject, "", target));
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeBugReports).Do();
}
}

28
src/Visual_DVM_2021/Passes/All/EditSubscriber.java
View File

@@ -1,30 +1,10 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global; import Common.Global;
import Repository.Server.ComponentsServer;
import Repository.Subscribes.Subscriber; import Repository.Subscribes.Subscriber;
import Visual_DVM_2021.Passes.EditObjectPass; import Visual_DVM_2021.Passes.Server.EditServerObject;
import Visual_DVM_2021.Passes.PassCode_2021; public class EditSubscriber extends EditServerObject<ComponentsServer,Subscriber> {
public class EditSubscriber extends EditObjectPass<Subscriber> {
public EditSubscriber() { public EditSubscriber() {
super(Subscriber.class); super(Global.componentsServer, Subscriber.class);
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.Subscriber)){
target = Current.getSubscriber();
return getTable().ShowEditObjectDialog(target);
}
return false;
}
@Override
protected Database getDb() {
return Global.componentsServer.db;
}
@Override
protected void performDone() throws Exception {
super.performDone();
//отправка.
passes.get(PassCode_2021.EditSubscriberOnServer).Do(target);
} }
} }

28
src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java
View File

@@ -1,28 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import Repository.Subscribes.Subscriber;
import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EditSubscriberOnServer extends ComponentsRepositoryPass<Subscriber> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (Subscriber) args[0];
return true;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeBugReports).Do();
}
@Override
protected void showDone() throws Exception {
super.showDone();
server.db.subscribers.ui_.Show(target.getPK());
}
}

16
src/Visual_DVM_2021/Passes/All/PublishTest.java
View File

@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import Common.Global; import Common.Global;
import Common.UI.UI; import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;
import TestingSystem.Common.Test.Test; import TestingSystem.Common.Test.Test;
import TestingSystem.Common.TestingServer; import TestingSystem.Common.TestingServer;
@@ -14,26 +13,15 @@ public class PublishTest extends PublishServerObject<TestingServer, Test> {
} }
db_project_info project = null; db_project_info project = null;
protected boolean setProject() { protected boolean setProject() {
if (Current.Check(Log, Current.Group, Current.Project) if (Current.Check(Log, Current.Group, Current.Project) && UI.Question("Добавить текущий проект в глобальную базу тестов")) {
&& UI.Question("Добавить текущий проект в глобальную базу тестов")) {
project = Current.getProject(); project = Current.getProject();
if (project.checkSubdirectories(Log)) {
switch (project.languageName) {
case fortran:
return passes.get(PassCode_2021.SPF_GetMaxMinBlockDistribution).Do();
case c:
project.testMaxDim = Utils.getCProjectMaxDim(project);
return true; return true;
default:
return false;
}
}
} }
return false; return false;
} }
@Override @Override
public boolean fillObjectFields() throws Exception { public boolean fillObjectFields() throws Exception {
if (setProject()) { if (setProject()&&project.checkSubdirectories(Log)) {
target.description = project.getLocalName() + " " + project.description; target.description = project.getLocalName() + " " + project.description;
target.dim = project.testMaxDim; target.dim = project.testMaxDim;
target.group_id = Current.getGroup().id; target.group_id = Current.getGroup().id;

2
src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java
View File

@@ -1,5 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Global; import Common.Global;
import Common.UI.UI;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.SilentSapforPass; import Visual_DVM_2021.Passes.SilentSapforPass;
public class SPF_GetMaxMinBlockDistribution extends SilentSapforPass { public class SPF_GetMaxMinBlockDistribution extends SilentSapforPass {
@@ -14,6 +15,7 @@ public class SPF_GetMaxMinBlockDistribution extends SilentSapforPass {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
if (super.canStart(args)){ if (super.canStart(args)){
UI.Info("+");
SPF_ParseFilesWithOrder.silent = true; SPF_ParseFilesWithOrder.silent = true;
return (passes.get(PassCode_2021.SPF_ParseFilesWithOrder).isDone() || passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do()); return (passes.get(PassCode_2021.SPF_ParseFilesWithOrder).isDone() || passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do());
} }

11
src/Visual_DVM_2021/Passes/PassCode_2021.java
View File

@@ -24,9 +24,7 @@ public enum PassCode_2021 {
EditAccount, EditAccount,
AddSubscriber, AddSubscriber,
EditSubscriber, EditSubscriber,
EditSubscriberOnServer,
DeleteSubscriber, DeleteSubscriber,
DeleteSubscriberOnServer,
//---- //----
SetSelectedFilesLanguage, SetSelectedFilesLanguage,
SetSelectedFilesStyle, SetSelectedFilesStyle,
@@ -262,7 +260,6 @@ public enum PassCode_2021 {
GetTestsQueueSize, GetTestsQueueSize,
ApplyCurrentFunction, ApplyCurrentFunction,
//-> //->
// GetRemoteUserHome,
CheckRemoteWorkspace, CheckRemoteWorkspace,
PublishRemoteWorkspace, PublishRemoteWorkspace,
//-> //->
@@ -299,12 +296,16 @@ public enum PassCode_2021 {
DeleteTest, DeleteTest,
DeleteConfiguration, DeleteConfiguration,
AbortTaskPackage, AbortTaskPackage,
//--
CreateTestFromDirectory,
//-> //->
TestPass; TestPass;
public String getDescription() { public String getDescription() {
switch (this) { switch (this) {
case Undefined: case Undefined:
return "?"; return "?";
case CreateTestFromDirectory:
return "Создать тест из папки";
case AbortTaskPackage: case AbortTaskPackage:
return "Прерывать пакет тестирования DVM"; return "Прерывать пакет тестирования DVM";
case DeleteConfiguration: case DeleteConfiguration:
@@ -365,10 +366,6 @@ public enum PassCode_2021 {
return "Редактировать учётную запись"; return "Редактировать учётную запись";
case DeleteSubscriber: case DeleteSubscriber:
return "Удалить учётную запись"; return "Удалить учётную запись";
case DeleteSubscriberOnServer:
return "Удалить учётную запись на сервере";
case EditSubscriberOnServer:
return "Редактировать учётную запись на сервере";
case CheckAccount: case CheckAccount:
return "Проверка учётной записи"; return "Проверка учётной записи";
case CheckRegistrationOnServer: case CheckRegistrationOnServer:

4
src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.Server; package Visual_DVM_2021.Passes.Server;
import Common.Database.riDBObject; import Common.Database.DBObject;
import Repository.RepositoryServer; import Repository.RepositoryServer;
public class DeleteServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> { public class DeleteServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/icons/Delete.png"; return "/icons/Delete.png";

4
src/Visual_DVM_2021/Passes/Server/EditServerObject.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.Server; package Visual_DVM_2021.Passes.Server;
import Common.Database.riDBObject; import Common.Database.DBObject;
import Repository.RepositoryServer; import Repository.RepositoryServer;
public class EditServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> { public class EditServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
//-- //--
@Override @Override
public String getIconPath() { public String getIconPath() {

4
src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java
View File

@@ -1,12 +1,12 @@
package Visual_DVM_2021.Passes.Server; package Visual_DVM_2021.Passes.Server;
import Common.Current; import Common.Current;
import Common.Database.DBObject;
import Common.Database.Database; import Common.Database.Database;
import Common.Database.riDBObject;
import Common.Global; import Common.Global;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021; import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.TestingServer; import TestingSystem.Common.TestingServer;
public class PublishServerAccountObject<D extends riDBObject> extends PublishServerObject<TestingServer, D> { public class PublishServerAccountObject<D extends DBObject> extends PublishServerObject<TestingServer, D> {
public PublishServerAccountObject(Class<D> d_in) { public PublishServerAccountObject(Class<D> d_in) {
super(Global.testingServer, d_in); super(Global.testingServer, d_in);
} }

12
src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
View File

@@ -1,9 +1,10 @@
package Visual_DVM_2021.Passes.Server; package Visual_DVM_2021.Passes.Server;
import Common.Current; import Common.Current;
import Common.Database.DBObject;
import Common.Database.riDBObject; import Common.Database.riDBObject;
import Repository.RepositoryServer; import Repository.RepositoryServer;
public class PublishServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> { public class PublishServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
protected Object pk = null; public Object pk = null;
public PublishServerObject(S server_in, Class<D> d_in) { public PublishServerObject(S server_in, Class<D> d_in) {
super(server_in, d_in); super(server_in, d_in);
} }
@@ -17,8 +18,11 @@ public class PublishServerObject<S extends RepositoryServer, D extends riDBObjec
pk = null; pk = null;
if (Current.getAccount().CheckRegistered(Log)) { if (Current.getAccount().CheckRegistered(Log)) {
target = d.newInstance(); target = d.newInstance();
target.sender_name = Current.getAccount().name; if (target instanceof riDBObject) {
target.sender_address = Current.getAccount().email; riDBObject rTarget = (riDBObject) target;
rTarget.sender_name = Current.getAccount().name;
rTarget.sender_address = Current.getAccount().email;
}
return fillObjectFields(); return fillObjectFields();
} }
return false; return false;

2
src/Visual_DVM_2021/UI/Interface/TestingWindow.java
View File

@@ -9,8 +9,6 @@ public interface TestingWindow extends VisualizerForm {
void ShowNoTestRunTask(); void ShowNoTestRunTask();
//- //-
void RefreshTabsNames(); void RefreshTabsNames();
void FocusTestingSystem();
void RemountTestTable(); void RemountTestTable();
//- //-
void FocusTestingTasks(); void FocusTestingTasks();

4
src/Visual_DVM_2021/UI/Main/MainForm.java
View File

@@ -240,6 +240,10 @@ public class MainForm extends Form implements MainWindow {
globalTabs.setSelectedIndex(1); globalTabs.setSelectedIndex(1);
} }
@Override @Override
public void FocusTests() {
globalTabs.setSelectedIndex(3);
}
@Override
public void FocusTesting() { public void FocusTesting() {
globalTabs.setSelectedIndex(4); globalTabs.setSelectedIndex(4);
} }

4
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -140,10 +140,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
filterName = new StyledTextField(); filterName = new StyledTextField();
} }
@Override @Override
public void FocusTestingSystem() {
testingTabs.setSelectedIndex(2);
}
@Override
public void FocusTestingTasks() { public void FocusTestingTasks() {
} }
@Override @Override