no message

This commit is contained in:
2023-11-20 22:29:38 +03:00
parent 577803515e
commit e43feb9ab5
8 changed files with 27 additions and 9 deletions

5
.idea/workspace.xml generated
View File

@@ -7,14 +7,13 @@
</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/CreateGroupFromDirectory.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$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.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/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.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/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/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.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/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/Visual_DVM_2021/Passes/All/PublishTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestProject.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/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

View File

@@ -31,7 +31,6 @@ public class CreateGroupFromDirectory extends Pass_2021<Group> {
target = null; target = null;
group_id = Constants.Nan; group_id = Constants.Nan;
//- //-
Utils.RestoreSelectedDirectory(directoryChooser);
dir = directoryChooser.ShowDialog(); dir = directoryChooser.ShowDialog();
//- //-
if (dir == null) if (dir == null)
@@ -65,7 +64,12 @@ public class CreateGroupFromDirectory extends Pass_2021<Group> {
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
for (File file : files) { for (File file : files) {
ShowMessage1("создание проекта: "+file.getName());
passes.get(PassCode_2021.CreateTestFromDirectory).Do(file, group_id); passes.get(PassCode_2021.CreateTestFromDirectory).Do(file, group_id);
} }
} }
@Override
protected void performFinish() throws Exception {
passes.get(PassCode_2021.SynchronizeTests).Do();
}
} }

View File

@@ -34,7 +34,6 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
target = null; target = null;
//- //-
if (args.length == 0) { if (args.length == 0) {
Utils.RestoreSelectedDirectory(directoryChooser);
if (!Current.Check(Log, Current.Group)) if (!Current.Check(Log, Current.Group))
return false; return false;
group_id = Current.getGroup().id; group_id = Current.getGroup().id;

View File

@@ -80,6 +80,10 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
} }
} }
@Override @Override
protected void performFinish() throws Exception {
passes.get(PassCode_2021.SynchronizeTests).Do();
}
@Override
protected void FocusResult() { protected void FocusResult() {
UI.getMainWindow().FocusTests(); UI.getMainWindow().FocusTests();
} }

View File

@@ -109,9 +109,7 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
Current.set(Current.Project, target); Current.set(Current.Project, target);
if (root_changes) if (root_changes)
Current.set(Current.Root, new_root); Current.set(Current.Root, new_root);
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do( Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir.getParent());
SettingName.ProjectsSearchDirectory, dir.getParent()
);
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do( Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(
SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0") SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0")
; ;

View File

@@ -70,4 +70,15 @@ public class PublishTest extends PublishServerObject<TestingServer, Test> {
super.performDone(); super.performDone();
passes.get(PassCode_2021.PublishTestProject).Do(project, pk); passes.get(PassCode_2021.PublishTestProject).Do(project, pk);
} }
@Override
protected void performFinish() throws Exception {
if (from_current_project)
super.performFinish();
else disconnect();
}
@Override
protected void showDone() throws Exception {
if (from_current_project)
super.showDone();
}
} }

View File

@@ -40,6 +40,7 @@ public class PublishTestProject extends TestingSystemPass<db_project_info> {
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
ShowMessage1(target.name);
Command(new ServerExchangeUnit_2021(ServerCode.PublishTestProject, String.valueOf(test_id), bytes)); Command(new ServerExchangeUnit_2021(ServerCode.PublishTestProject, String.valueOf(test_id), bytes));
} }
@Override @Override

View File

@@ -305,6 +305,8 @@ public enum PassCode_2021 {
switch (this) { switch (this) {
case Undefined: case Undefined:
return "?"; return "?";
case CreateGroupFromDirectory:
return "Создать группу тестов из папки";
case CreateTestFromDirectory: case CreateTestFromDirectory:
return "Создать тест из папки"; return "Создать тест из папки";
case AbortTaskPackage: case AbortTaskPackage: