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

v++, перетасовал вкладки.

Browse Source
This commit is contained in:
02090095
2024-03-13 21:17:32 +03:00
parent 0238cc1b3e
commit 431d23f427
12 changed files with 80 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.idea/workspace.xml generated
View File

@@ -7,26 +7,17 @@
</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/CreateDVMPackageFromCurrentProject.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.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/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenu.java" 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/TestingSystem/Common/Group/UI/AddGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/AddGroupMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/EditGroupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/UI/EditGroupMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.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" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/CredentialsWindow.java" beforeDir="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/CredentialsForm.form" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CredentialsForm.java" beforeDir="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.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" 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" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.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" />

6
src/Common/UI/Menus_2023/VisualiserMenu.java
View File

@@ -2,6 +2,8 @@ package Common.UI.Menus_2023;
import Common.Current; import Common.Current;
import Common.UI.Themes.VisualiserFonts; import Common.UI.Themes.VisualiserFonts;
import Common.Utils.Utils; import Common.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -18,4 +20,8 @@ public class VisualiserMenu extends JMenu {
public VisualiserMenu(String text, String iconPath) { public VisualiserMenu(String text, String iconPath) {
this(text, iconPath, false); this(text, iconPath, false);
} }
public void addPasses(PassCode_2021... codes) {
for (PassCode_2021 code : codes)
add(Pass_2021.passes.get(code).createMenuItem());
}
} }

2
src/Repository/Component/Visualiser.java
View File

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override @Override
public void GetVersionInfo() { public void GetVersionInfo() {
version = 1076; version = 1077;
String pattern = "MMM dd yyyy HH:mm:ss"; String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime()); date_text = df.format(getClassBuildTime());

7
src/TestingSystem/Common/Group/UI/AddGroupMenu.java
View File

@@ -1,12 +1,9 @@
package TestingSystem.Common.Group.UI; package TestingSystem.Common.Group.UI;
import Common.UI.Menus_2023.VisualiserMenu; import Common.UI.Menus_2023.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class AddGroupMenu extends VisualiserMenu { public class AddGroupMenu extends VisualiserMenu {
public AddGroupMenu() { public AddGroupMenu() {
super("Добавление группы", "/icons/RedAdd.png", false); super("", "/icons/RedAdd.png");
add(Pass_2021.passes.get(PassCode_2021.PublishGroup).createMenuItem()); addPasses(PassCode_2021.PublishGroup,PassCode_2021.CreateGroupFromDirectory,PassCode_2021.CreateGroupFromFiles);
add(Pass_2021.passes.get(PassCode_2021.CreateGroupFromDirectory).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.CreateGroupFromFiles).createMenuItem());
} }
} }

5
src/TestingSystem/Common/Group/UI/EditGroupMenu.java
View File

@@ -4,8 +4,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
public class EditGroupMenu extends VisualiserMenu { public class EditGroupMenu extends VisualiserMenu {
public EditGroupMenu() { public EditGroupMenu() {
super("Редактирование группы", "/icons/Edit.png", false); super("", "/icons/Edit.png" );
add(Pass_2021.passes.get(PassCode_2021.EditGroup).createMenuItem()); addPasses(PassCode_2021.EditGroup, PassCode_2021.ReplaceTestsFromFiles);
add(Pass_2021.passes.get(PassCode_2021.ReplaceTestsFromFiles).createMenuItem());
} }
} }

26
src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -3,23 +3,27 @@ import Common.Global;
import Common.UI.Menus_2023.DataMenuBar; import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton; import Common.UI.Menus_2023.MenuBarButton;
import Common.Utils.Utils; import Common.Utils.Utils;
import TestingSystem.Common.Group.UI.AddGroupMenu;
import TestingSystem.Common.Group.UI.EditGroupMenu;
import TestingSystem.DVM.DVMPackage.UI.AddDVMPackageMenu;
import TestingSystem.DVM.DVMPackage.UI.EditDVMPackageMenu;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable; import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*; import javax.swing.*;
public class DVMPackagesBar extends DataMenuBar { public class DVMPackagesBar extends DataMenuBar {
public DVMPackagesBar() { public DVMPackagesBar() {
super("пакеты задач DVM", super("пакеты задач DVM");
PassCode_2021.SynchronizeTests, addPasses(PassCode_2021.SynchronizeTests);
PassCode_2021.AddDVMPackage, addSeparator();
PassCode_2021.AddTasksToDVMPackage, addMenus(new AddDVMPackageMenu());
PassCode_2021.CloneDVMPackage, addPasses(PassCode_2021.AddTasksToDVMPackage,PassCode_2021.DeleteDVMPackage);
PassCode_2021.StartDVMPackage, addSeparator();
PassCode_2021.DownloadDVMPackage, addPasses(PassCode_2021.StartDVMPackage,
PassCode_2021.AbortDVMPackage, PassCode_2021.AbortDVMPackage);
PassCode_2021.DeleteDVMPackage, addSeparator();
PassCode_2021.ExportDVMPackageToExcel addPasses(PassCode_2021.DownloadDVMPackage,
); PassCode_2021.ExportDVMPackageToExcel);
add(new JSeparator()); add(new JSeparator());
add(new MenuBarButton() { add(new MenuBarButton() {
{ {

11
src/TestingSystem/DVM/DVMPackage/UI/AddDVMPackageMenu.java Normal file
View File

@@ -0,0 +1,11 @@
package TestingSystem.DVM.DVMPackage.UI;
import Common.UI.Menus_2023.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class AddDVMPackageMenu extends VisualiserMenu {
public AddDVMPackageMenu() {
super("", "/icons/RedAdd.png");
addPasses(PassCode_2021.AddDVMPackage,
PassCode_2021.CloneDVMPackage);
}
}

9
src/TestingSystem/DVM/DVMPackage/UI/EditDVMPackageMenu.java Normal file
View File

@@ -0,0 +1,9 @@
package TestingSystem.DVM.DVMPackage.UI;
import Common.UI.Menus_2023.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EditDVMPackageMenu extends VisualiserMenu {
public EditDVMPackageMenu() {
super("", "/icons/Edit.png");
addPasses(PassCode_2021.AddTasksToDVMPackage);
}
}

9
src/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java Normal file
View File

@@ -0,0 +1,9 @@
package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.UI.Menus_2023.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
public class AddSapforPackageMenu extends VisualiserMenu {
public AddSapforPackageMenu() {
super("", "/icons/RedAdd.png");
addPasses(PassCode_2021.AddSapforPackage,PassCode_2021.CloneSapforPackage);
}
}

19
src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
View File

@@ -3,23 +3,24 @@ import Common.Global;
import Common.UI.Menus_2023.DataMenuBar; import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton; import Common.UI.Menus_2023.MenuBarButton;
import Common.Utils.Utils; import Common.Utils.Utils;
import TestingSystem.Common.Group.GroupsDBTable;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable; import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*; import javax.swing.*;
public class SapforPackagesBar extends DataMenuBar { public class SapforPackagesBar extends DataMenuBar {
public SapforPackagesBar() { public SapforPackagesBar() {
super("пакеты задач SAPFOR", super("пакеты задач SAPFOR");
PassCode_2021.SynchronizeTests, addPasses(PassCode_2021.SynchronizeTests);
PassCode_2021.CompareSapforPackages, addSeparator();
PassCode_2021.AddSapforPackage, addMenus(new AddSapforPackageMenu());
PassCode_2021.AddTasksToSapforPackage, addPasses(PassCode_2021.AddTasksToSapforPackage, PassCode_2021.DeleteSapforPackage);
PassCode_2021.CloneSapforPackage, addSeparator();
addPasses(
PassCode_2021.StartSapforPackage, PassCode_2021.StartSapforPackage,
PassCode_2021.AbortSapforPackage, PassCode_2021.AbortSapforPackage
PassCode_2021.DeleteSapforPackage
); );
addSeparator();
addPasses(PassCode_2021.CompareSapforPackages);
add(new JSeparator()); add(new JSeparator());
add(new MenuBarButton() { add(new MenuBarButton() {
{ {

4
src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
View File

@@ -16,6 +16,10 @@ public class AddDVMPackage extends AddObjectPass<DVMPackage> {
super(DVMPackage.class); super(DVMPackage.class);
} }
@Override @Override
public String getIconPath() {
return "/icons/CreateProject.png";
}
@Override
protected Database getDb() { protected Database getDb() {
return Global.testingServer.db; return Global.testingServer.db;
} }

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

@@ -360,7 +360,7 @@ public enum PassCode_2021 {
case DeleteSapforPackage: case DeleteSapforPackage:
return "Удалить пакеты тестирования SAPFOR"; return "Удалить пакеты тестирования SAPFOR";
case AddSapforPackage: case AddSapforPackage:
return "Добавить пакет задач SAPFOR"; return "Создать пустой пакет";
case AbortDVMPackage: case AbortDVMPackage:
return "Прервать пакет тестирования DVM"; return "Прервать пакет тестирования DVM";
case DeleteDVMPackage: case DeleteDVMPackage:
@@ -372,7 +372,7 @@ public enum PassCode_2021 {
case AddTasksToDVMPackage: case AddTasksToDVMPackage:
return "Добавить задачи в пакет тестирования DVM"; return "Добавить задачи в пакет тестирования DVM";
case AddDVMPackage: case AddDVMPackage:
return "Добавить пакет тестирования DVM"; return "Создать пустой пакет";
case ActualizePackages: case ActualizePackages:
return "Обновить пакеты задач"; return "Обновить пакеты задач";
case ActualizeDVMPackages: case ActualizeDVMPackages: