отображение машины и ползователя на вкладке тестирования.
This commit is contained in:
20
.idea/workspace.xml
generated
20
.idea/workspace.xml
generated
@@ -7,10 +7,26 @@
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/icons/Kernels.png" 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/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" 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/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MenuBarButton.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenuBar.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.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/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="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/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.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/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" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
||||
@@ -28,5 +28,5 @@
|
||||
"TestingKernels": 28,
|
||||
"AutoCheckTesting": true,
|
||||
"CheckTestingIntervalSeconds": 10,
|
||||
"EmailOnTestingProgress": false
|
||||
"EmailOnTestingProgress": true
|
||||
}
|
||||
10
src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java
Normal file
10
src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java
Normal file
@@ -0,0 +1,10 @@
|
||||
package Common.UI.Menus_2023.DVMPackagesBar;
|
||||
import Common.UI.Menus_2023.DataMenuBar;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
public class DVMPackagesBar extends DataMenuBar {
|
||||
public DVMPackagesBar() {
|
||||
super("пакеты задач DVM", PassCode_2021.AddDVMPackage
|
||||
// PassCode_2021.ExportTasksPackageToExcel,PassCode_2021.AbortTaskPackage, PassCode_2021.DeleteTasksPackage
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -19,4 +19,5 @@ public interface MainWindow {
|
||||
//-
|
||||
void ShowCredentials();
|
||||
void ShowCheckedTestsCount();
|
||||
void FocusCredentials();
|
||||
}
|
||||
|
||||
@@ -29,4 +29,7 @@ public class MenuBarButton extends JButton {
|
||||
public void setIcon(String icon_path) {
|
||||
setIcon(Utils.getIcon(icon_path));
|
||||
}
|
||||
public void setFont(VisualiserFonts font_in){
|
||||
setFont(Current.getTheme().Fonts.get(font_in));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,22 +7,49 @@ import Common.UI.Themes.VisualiserFonts;
|
||||
import Common.UI.UI;
|
||||
import Common.Utils.Utils;
|
||||
import TestingSystem.Common.TestingServer;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
public class TestingBar extends VisualiserMenuBar {
|
||||
public MenuBarButton MachineButton;
|
||||
public MenuBarButton UserButton;
|
||||
|
||||
// public JLabel MachineLabel;
|
||||
// public JLabel UserLabel;
|
||||
public JLabel KernelsLabel;
|
||||
|
||||
public JButton autorefreshButton;
|
||||
JSpinner sCheckTime;
|
||||
JSpinner sKernels;
|
||||
public TestingBar() {
|
||||
addPasses(PassCode_2021.SynchronizeTestsTasks);
|
||||
// addPasses(PassCode_2021.SynchronizeTestsTasks);
|
||||
//--
|
||||
add(new JLabel(" ядер ") {
|
||||
// AddLabel("машина: ", "/icons/Machine.png");
|
||||
add(MachineButton = new MenuBarButton() {
|
||||
{
|
||||
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
|
||||
setIcon("/icons/Machine.png");
|
||||
setFont(VisualiserFonts.TreePlain);
|
||||
setToolTipText("Машина тестирования");
|
||||
addActionListener(e -> {
|
||||
UI.getMainWindow().FocusCredentials();
|
||||
});
|
||||
}
|
||||
});
|
||||
//--
|
||||
add(UserButton = new MenuBarButton() {
|
||||
{
|
||||
setIcon("/icons/User.png");
|
||||
setFont(VisualiserFonts.TreePlain);
|
||||
setToolTipText("Учетная запись машины тестирования");
|
||||
addActionListener(e -> {
|
||||
UI.getMainWindow().FocusCredentials();
|
||||
});
|
||||
}
|
||||
});
|
||||
//-
|
||||
KernelsLabel = addLabel("", "/icons/Kernels.png");
|
||||
KernelsLabel.setHorizontalTextPosition(JLabel.LEFT);
|
||||
KernelsLabel.setToolTipText("количество ядер, задействованное при тестировании");
|
||||
add(sKernels = new JSpinner());
|
||||
sKernels.setPreferredSize(new Dimension(60, 26));
|
||||
sKernels.setMaximumSize(new Dimension(60, 26));
|
||||
@@ -33,6 +60,9 @@ public class TestingBar extends VisualiserMenuBar {
|
||||
UI.MakeSpinnerRapid(sKernels, e -> {
|
||||
Global.properties.updateField("TestingKernels", sKernels.getValue());
|
||||
});
|
||||
|
||||
|
||||
addLabel(" ");
|
||||
//--
|
||||
add(new MenuBarButton() {
|
||||
{
|
||||
@@ -48,6 +78,7 @@ public class TestingBar extends VisualiserMenuBar {
|
||||
setIcon(Utils.getIcon(Global.properties.EmailOnTestingProgress ? "/icons/Pick.png" : "/icons/NotPick.png"));
|
||||
}
|
||||
});
|
||||
|
||||
//--
|
||||
add(autorefreshButton = new MenuBarButton() {
|
||||
{
|
||||
@@ -88,4 +119,16 @@ public class TestingBar extends VisualiserMenuBar {
|
||||
public void ShowAutoCheckTesting() {
|
||||
autorefreshButton.setIcon(Utils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));
|
||||
}
|
||||
public void ShowMachine(){
|
||||
MachineButton.setText(Current.getMachine().getURL());
|
||||
}
|
||||
public void ShowUser(){
|
||||
UserButton.setText(Current.getUser().login);
|
||||
}
|
||||
public void ShowNoMachine(){
|
||||
MachineButton.setText("?");
|
||||
}
|
||||
public void ShowNoUser(){
|
||||
UserButton.setText("?");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
package Common.UI.Menus_2023;
|
||||
import Common.Current;
|
||||
import Common.UI.Themes.VisualiserFonts;
|
||||
import Common.Utils.Utils;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
|
||||
@@ -25,6 +28,21 @@ public class VisualiserMenuBar extends JToolBar {
|
||||
add(bar);
|
||||
return bar;
|
||||
}
|
||||
public JLabel addLabel(String text_in) {
|
||||
return addLabel(text_in, null);
|
||||
}
|
||||
public JLabel addLabel(String text_in, String icon_path_in) {
|
||||
JLabel res = new JLabel(text_in) {
|
||||
{
|
||||
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
|
||||
if (icon_path_in != null) {
|
||||
setIcon(Utils.getIcon(icon_path_in));
|
||||
}
|
||||
}
|
||||
};
|
||||
add(res);
|
||||
return res;
|
||||
}
|
||||
public void setSizeLimits() {
|
||||
setPreferredSize(new Dimension(0, 30));
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import Common.Global;
|
||||
import Common.UI.Menus_2023.BugReportsMenuBar.BugReportsMenuBar;
|
||||
import Common.UI.Menus_2023.CompilersMenuBar.CompilersMenuBar;
|
||||
import Common.UI.Menus_2023.ConfigurationsMenuBar.ConfigurationsMenuBar;
|
||||
import Common.UI.Menus_2023.DVMPackagesBar.DVMPackagesBar;
|
||||
import Common.UI.Menus_2023.DVMParametersMenuBar.DVMParametersMenuBar;
|
||||
import Common.UI.Menus_2023.DataMenuBar;
|
||||
import Common.UI.Menus_2023.EnvironmentValuesMenuBar.EnvironmentValuesMenuBar;
|
||||
@@ -59,6 +60,7 @@ import GlobalData.User.UsersDBTable;
|
||||
import ProjectData.DBArray.ArraysDBTable;
|
||||
import ProjectData.Files.UI.FilesTreeCellRenderer;
|
||||
import Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
|
||||
import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
|
||||
import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
|
||||
import ProjectData.Project.UI.VersionsTreeCellRenderer;
|
||||
import ProjectData.SapforData.Arrays.ArraysSet;
|
||||
@@ -220,7 +222,8 @@ public class UI {
|
||||
menuBars.put(GroupsDBTable.class, new GroupsMenuBar());
|
||||
menuBars.put(TestDBTable.class, new TestsMenuBar());
|
||||
menuBars.put(ConfigurationDBTable.class, new ConfigurationsMenuBar());
|
||||
menuBars.put(TasksPackageDBTable.class, new TasksPackagesMenuBar());
|
||||
menuBars.put(DVMPackageDBTable.class, new DVMPackagesBar());
|
||||
// menuBars.put(TasksPackageDBTable.class, new TasksPackagesMenuBar());
|
||||
menuBars.put(TestRunTasksDBTable.class, new TestRunTasksMenuBar());
|
||||
//--->>>
|
||||
menuBars.put(MachinesDBTable.class, new MachinesMenuBar());
|
||||
|
||||
@@ -58,6 +58,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
|
||||
public void SetEditLimits() {
|
||||
fields.cbMachineType.setEnabled(false);
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
@Override
|
||||
@@ -83,11 +84,13 @@ public class MachinesDBTable extends iDBTable<Machine> {
|
||||
public void ShowCurrentObject() throws Exception {
|
||||
super.ShowCurrentObject();
|
||||
UI.getMainWindow().ShowCredentials();
|
||||
UI.testingBar.ShowMachine();
|
||||
}
|
||||
@Override
|
||||
public void ShowNoCurrentObject() throws Exception {
|
||||
super.ShowNoCurrentObject();
|
||||
UI.getMainWindow().ShowCredentials();
|
||||
UI.testingBar.ShowNoMachine();
|
||||
}
|
||||
@Override
|
||||
protected void AdditionalInitColumns() {
|
||||
|
||||
@@ -77,11 +77,13 @@ public class UsersDBTable extends iDBTable<User> {
|
||||
public void ShowCurrentObject() throws Exception {
|
||||
super.ShowCurrentObject();
|
||||
UI.getMainWindow().ShowCredentials();
|
||||
UI.testingBar.ShowUser();
|
||||
}
|
||||
@Override
|
||||
public void ShowNoCurrentObject() throws Exception {
|
||||
super.ShowNoCurrentObject();
|
||||
UI.getMainWindow().ShowCredentials();
|
||||
UI.testingBar.ShowNoUser();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
@@ -16,7 +16,8 @@ public class TestingPackage extends rDBObject {
|
||||
public String version = ""; //версия тестируемого объекта
|
||||
public String drv = ""; //пусть к исполняемому файлы тестируемого объекта
|
||||
//--
|
||||
public TasksPackageState state = TasksPackageState.Queued;
|
||||
public int progress = 0; //прогресс выполнения
|
||||
public TasksPackageState state = TasksPackageState.Draft;
|
||||
//--
|
||||
@Override
|
||||
public Object getPK() {
|
||||
@@ -34,6 +35,7 @@ public class TestingPackage extends rDBObject {
|
||||
version = tasksPackage.version;
|
||||
drv = tasksPackage.drv;
|
||||
kernels = tasksPackage.kernels;
|
||||
progress = tasksPackage.progress;
|
||||
state = tasksPackage.state;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
public ConfigurationDBTable configurations;
|
||||
public TestDBTable tests;
|
||||
public GroupsDBTable groups;
|
||||
public DVMPackageDBTable dvm_packages;
|
||||
public DVMPackageDBTable dvmPackages;
|
||||
//--
|
||||
public SapforConfigurationDBTable sapforConfigurations;
|
||||
public SapforConfigurationCommandsDBTable sapforConfigurationCommands;
|
||||
@@ -34,7 +34,7 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
addTable(configurations = new ConfigurationDBTable());
|
||||
addTable(groups = new GroupsDBTable());
|
||||
addTable(tests = new TestDBTable());
|
||||
addTable(dvm_packages = new DVMPackageDBTable());
|
||||
addTable(dvmPackages = new DVMPackageDBTable());
|
||||
addTable(settings = new TSettingsDBTable());
|
||||
//-
|
||||
addTable(sapforConfigurations = new SapforConfigurationDBTable());
|
||||
|
||||
@@ -9,8 +9,7 @@ import TestingSystem.DVM.TasksPackage.TasksPackage;
|
||||
import java.util.Date;
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
import static Common.UI.Tables.TableRenderers.RendererDate;
|
||||
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
|
||||
import static Common.UI.Tables.TableRenderers.*;
|
||||
public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
|
||||
public DVMPackageDBTable() {
|
||||
super(Long.class, DVMPackage.class);
|
||||
@@ -36,10 +35,10 @@ public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
|
||||
}
|
||||
@Override
|
||||
protected void AdditionalInitColumns() {
|
||||
// columns.get(0).setVisible(false);
|
||||
columns.get(8).setRenderer(RendererDate);
|
||||
columns.get(8).setRenderer(RendererProgress);
|
||||
columns.get(9).setRenderer(RendererDate);
|
||||
columns.get(10).setRenderer(RendererStatusEnum);
|
||||
columns.get(10).setRenderer(RendererDate);
|
||||
columns.get(11).setRenderer(RendererStatusEnum);
|
||||
}
|
||||
@Override
|
||||
public void ShowCurrentObject() throws Exception {
|
||||
@@ -65,6 +64,7 @@ public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
|
||||
"Задач",
|
||||
|
||||
"Ядер",
|
||||
"Прогресс",
|
||||
"Начало",
|
||||
"Изменено",
|
||||
"Статус"
|
||||
@@ -86,10 +86,12 @@ public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
|
||||
case 7:
|
||||
return object.kernels;
|
||||
case 8:
|
||||
return new Date(object.date);
|
||||
return object.progress;
|
||||
case 9:
|
||||
return new Date(object.change_date);
|
||||
return new Date(object.date);
|
||||
case 10:
|
||||
return new Date(object.change_date);
|
||||
case 11:
|
||||
return object.state;
|
||||
default:
|
||||
return null;
|
||||
|
||||
@@ -8,6 +8,8 @@ import java.util.Arrays;
|
||||
import java.util.Vector;
|
||||
import java.util.stream.Collectors;
|
||||
public enum TasksPackageState implements StatusEnum {
|
||||
Draft,
|
||||
//--
|
||||
Queued,
|
||||
//--
|
||||
TestsSynchronize, //оставить.
|
||||
@@ -31,6 +33,7 @@ public enum TasksPackageState implements StatusEnum {
|
||||
switch (this) {
|
||||
case Done:
|
||||
case Aborted:
|
||||
case Draft:
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
@@ -41,6 +44,7 @@ public enum TasksPackageState implements StatusEnum {
|
||||
switch (this) {
|
||||
case TestsSynchronize:
|
||||
case Analysis:
|
||||
case Draft:
|
||||
return Current.getTheme().Fonts.get(VisualiserFonts.BlueState);
|
||||
case CompilationExecution:
|
||||
case RunningExecution:
|
||||
@@ -54,6 +58,8 @@ public enum TasksPackageState implements StatusEnum {
|
||||
//-
|
||||
public String getDescription() {
|
||||
switch (this) {
|
||||
case Draft:
|
||||
return "Подготовка к публикации";
|
||||
case Aborted:
|
||||
return "Прерван";
|
||||
case Queued:
|
||||
|
||||
63
src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
Normal file
63
src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
Normal file
@@ -0,0 +1,63 @@
|
||||
package Visual_DVM_2021.Passes.All;
|
||||
import Common.Current;
|
||||
import Common.Database.Database;
|
||||
import Common.Global;
|
||||
import GlobalData.Compiler.CompilerType;
|
||||
import GlobalData.Machine.MachineType;
|
||||
import GlobalData.User.UserState;
|
||||
import TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||
import TestingSystem.DVM.TasksPackage.TasksPackage;
|
||||
import Visual_DVM_2021.Passes.AddObjectPass;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
|
||||
import java.util.Date;
|
||||
public class AddDVMPackage extends AddObjectPass<DVMPackage> {
|
||||
public AddDVMPackage() {
|
||||
super(DVMPackage.class);
|
||||
}
|
||||
@Override
|
||||
protected Database getDb() {
|
||||
return Global.testingServer.db;
|
||||
}
|
||||
@Override
|
||||
protected boolean canStart(Object... args) throws Exception {
|
||||
if (!Current.getAccount().CheckRegistered(Log)) {
|
||||
return false;
|
||||
}
|
||||
if (Current.Check(Log, Current.Machine, Current.User, Current.Compiler)) {
|
||||
if (!Current.getMachine().type.equals(MachineType.Server)) {
|
||||
Log.Writeln_("Тестирование поддерживается только на одиночном удалённом сервере.");
|
||||
return false;
|
||||
}
|
||||
if (!Current.getUser().state.equals(UserState.ready_to_work)) {
|
||||
Log.Writeln_("Пользователь не готов к работе. Выполните инициализацию пользователя!");
|
||||
return false;
|
||||
}
|
||||
if (!Current.getCompiler().type.equals(CompilerType.dvm)) {
|
||||
Log.Writeln_("Тестирование поддерживается только для DVM компиляторов.");
|
||||
return false;
|
||||
}
|
||||
if (!Current.getCompiler().versionLoaded)
|
||||
passes.get(PassCode_2021.ShowCompilerVersion).Do(Current.getCompiler(), false);
|
||||
//--
|
||||
target = new DVMPackage();
|
||||
//-
|
||||
target.sender_name=Current.getAccount().name;
|
||||
target.sender_address = Current.getAccount().email;
|
||||
//-
|
||||
target.machine_name = Current.getMachine().name;
|
||||
target.machine_address = Current.getMachine().address;
|
||||
target.machine_port = Current.getMachine().port;
|
||||
//-
|
||||
target.user_name = Current.getUser().login;
|
||||
target.user_password = Current.getUser().password;
|
||||
target.user_workspace = Current.getUser().workspace;
|
||||
target.drv = Current.getCompiler().call_command;
|
||||
target.version = Current.getCompiler().getVersionInfo();
|
||||
target.kernels = Global.properties.TestingKernels;
|
||||
//--
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -309,11 +309,15 @@ public enum PassCode_2021 {
|
||||
ActualizeSAPFORPackages,
|
||||
ActualizePackages,
|
||||
//->
|
||||
AddDVMPackage,
|
||||
//->
|
||||
TestPass;
|
||||
public String getDescription() {
|
||||
switch (this) {
|
||||
case Undefined:
|
||||
return "?";
|
||||
case AddDVMPackage:
|
||||
return "Добавить пакет тестирования DVM";
|
||||
case ActualizePackages:
|
||||
return "Обновить пакеты задач";
|
||||
case ActualizeDVMPackages:
|
||||
|
||||
@@ -229,6 +229,10 @@ public class MainForm extends Form implements MainWindow {
|
||||
globalTabs.setSelectedIndex(1);
|
||||
}
|
||||
@Override
|
||||
public void FocusCredentials() {
|
||||
globalTabs.setSelectedIndex(2);
|
||||
}
|
||||
@Override
|
||||
public void FocusTests() {
|
||||
globalTabs.setSelectedIndex(3);
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
</properties>
|
||||
<border type="none"/>
|
||||
<children>
|
||||
<grid id="b1fe2" binding="packagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
|
||||
<grid id="b1fe2" binding="dvmPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
|
||||
<constraints border-constraint="Center"/>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
|
||||
@@ -34,7 +34,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
||||
private JButton bChangeKernels;
|
||||
private JTextField filterName;
|
||||
private JPanel configurationsPanel;
|
||||
private JPanel packagesPanel;
|
||||
private JPanel dvmPackagesPanel;
|
||||
private JButton bCompilationFilter;
|
||||
private JPanel dvmTestingPanel;
|
||||
private JPanel sapforTestingPanel;
|
||||
@@ -85,8 +85,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
||||
SC66.setRightComponent(sapforVersionSlave.getContent());
|
||||
//-
|
||||
Global.testingServer.db.configurations.mountUI(configurationsPanel);
|
||||
Global.testingServer.account_db.packages.mountUI(packagesPanel);
|
||||
Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
|
||||
Global.testingServer.db.dvmPackages.mountUI(dvmPackagesPanel);
|
||||
|
||||
// Global.testingServer.account_db.packages.mountUI(packagesPanel);
|
||||
// Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
|
||||
//--
|
||||
Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
|
||||
Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
|
||||
@@ -99,7 +101,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
||||
@Override
|
||||
public void ShowAll() {
|
||||
Global.testingServer.db.configurations.ShowUI();
|
||||
Global.testingServer.account_db.packages.ShowUI();
|
||||
// Global.testingServer.account_db.packages.ShowUI();
|
||||
Global.testingServer.db.dvmPackages.ShowUI();
|
||||
//--
|
||||
Global.testingServer.db.serverSapfors.ShowUI();
|
||||
Global.testingServer.db.sapforConfigurations.ShowUI();
|
||||
@@ -163,13 +166,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
||||
}
|
||||
@Override
|
||||
public void RemountTestTable() {
|
||||
UI.Clear(packagesPanel);
|
||||
UI.Clear(dvmPackagesPanel);
|
||||
UI.Clear(testsRunTasksPanel);
|
||||
UI.Clear(sapforTasksPackagesPanel);
|
||||
UI.Clear(sapforTasksPanel);
|
||||
DropSapforComparison();
|
||||
//-->>
|
||||
Global.testingServer.account_db.packages.mountUI(packagesPanel);
|
||||
Global.testingServer.account_db.packages.mountUI(dvmPackagesPanel);
|
||||
Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
|
||||
Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
|
||||
Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);
|
||||
|
||||
BIN
src/icons/Kernels.png
Normal file
BIN
src/icons/Kernels.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Reference in New Issue
Block a user