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

Перенос кнопки синхронизации на панель тестирования. Исправление бага с формированием пакета.

Browse Source
This commit is contained in:
02090095
2023-12-18 15:44:48 +03:00
parent ed2222c163
commit ef65bb2439
24 changed files with 315 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Common/Global.java
View File

@@ -41,7 +41,7 @@ public class Global {
public static final String Sts = "Sts";
public static final String Repo = "Repo";
public static final String Tests = "Tests";
public static final String Packages = "Packages";
public static final String DVMPackages = "DVMPackages";
public static final String PerformanceAnalyzer = "PerformanceAnalyzer";
public static GlobalProperties properties = new GlobalProperties();
//</editor-fold>
@@ -76,7 +76,7 @@ public class Global {
public static File TestsDirectory;
public static File PerformanceAnalyzerDirectory;
public static File DataBackUpsDirectory;
public static File PackagesDirectory;
public static File DVMPackagesDirectory;
public static File SapforsDirectory;
public static File SapforPackagesDirectory;
//------------------------------------------------------------------
@@ -117,7 +117,7 @@ public class Global {
Utils.CheckDirectory(StsDirectory = Paths.get(Home, Sts).toFile());
Utils.CheckDirectory(TestsDirectory = Paths.get(Home, Tests).toFile());
Utils.CheckDirectory(PerformanceAnalyzerDirectory = Paths.get(Home, PerformanceAnalyzer).toFile());
Utils.CheckDirectory(PackagesDirectory = Paths.get(Home, Packages).toFile());
Utils.CheckDirectory(DVMPackagesDirectory = Paths.get(Home, DVMPackages).toFile());
Utils.CheckAndCleanDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
}
public static void CheckServerDirectories() {
@@ -135,7 +135,7 @@ public class Global {
//-
Utils.CheckDirectory(TestsDirectory = Paths.get(Home, Tests).toFile());
Utils.CheckDirectory(RepoDirectory = Paths.get(Home, Repo).toFile());
Utils.CheckDirectory(PackagesDirectory = Paths.get(Home, Packages).toFile());
Utils.CheckDirectory(DVMPackagesDirectory = Paths.get(Home, DVMPackages).toFile());
Utils.CheckDirectory(SapforsDirectory = Paths.get(Home, "Sapfors").toFile());
Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
}
@@ -320,6 +320,7 @@ public class Global {
//---
ActivateDB(); //тут current getAccount; роль по умолчанию всегда неизвестна.
///--------------
/*
Current.set(Current.Account, new Account(){
{
name = "M";
@@ -327,7 +328,8 @@ public class Global {
role = AccountRole.Admin;
}
});
// Pass_2021.passes.get(PassCode_2021.CheckAccount).Do();
*/
Pass_2021.passes.get(PassCode_2021.CheckAccount).Do();
//---------------
componentsServer.ActivateDB();
testingServer.ActivateDB();

3
src/Common/UI/Menus_2023/TestingBar/TestingBar.java
View File

@@ -7,6 +7,7 @@ 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.*;
@@ -22,7 +23,7 @@ public class TestingBar extends VisualiserMenuBar {
JSpinner sCheckTime;
JSpinner sKernels;
public TestingBar() {
// addPasses(PassCode_2021.SynchronizeTestsTasks);
addPasses(PassCode_2021.SynchronizeTests);
//--
// AddLabel("машина: ", "/icons/Machine.png");
add(MachineButton = new MenuBarButton() {