убрал возможность задавать тип машины как кластера

This commit is contained in:
2025-02-10 16:14:48 +03:00
parent bc750f8db0
commit 7eecdf8f4d
8 changed files with 41 additions and 15 deletions

View File

@@ -33,8 +33,8 @@ public class MachineFields implements DialogFields {
//-
cbMachineType = new JComboBox<>();
cbMachineType.addItem(MachineType.Server);
cbMachineType.addItem(MachineType.MVS_cluster);
cbMachineType.addItem(MachineType.Local);
// cbMachineType.addItem(MachineType.MVS_cluster);
// cbMachineType.addItem(MachineType.Local);
}
@Override
public Component getContent() {

View File

@@ -1,8 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
public class TestPass extends Pass {
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.Common.Test.Test;
public class TestPass extends TestingServerPass {
/*
LinkedHashMap<Integer,SapforConfiguration> unpackConfigurationsOld(SapforPackage sapforPackage){
LinkedHashMap<Integer,SapforConfiguration> res = new LinkedHashMap<>();
@@ -27,7 +30,13 @@ public class TestPass extends Pass {
*/
@Override
protected void body() throws Exception {
for (SapforPackage sapforPackage : Global.testingServer.db.sapforPackages.Data.values()) {
}
if (!SendRequest(ServerCode.TestCode));
/*
for (Test test: Global.testingServer.db.tests.Data.values()){
if (!SendRequest(ServerCode.DownloadTest, String.valueOf(test.id))){
UI.Info(String.valueOf(test.id));
};
}
*/
}
}

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
@Override
public void GetVersionInfo() {
version = 1149;
version = 1150;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());

View File

@@ -90,8 +90,8 @@ public enum ServerCode {
StartNecessaryMachines,
GetSapforForCompilation,
GetMaxSapforVersion,
PerformAutoSapforTesting;
PerformAutoSapforTesting,
TestCode;
public String getDescription(){
switch (this){
case GetComponentsVersionsInfo:

View File

@@ -374,6 +374,9 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
Print("Получить максимальную установленную версию Sapfor");
GetSapforMaxVersion();
break;
case TestCode:
checkUnpackedTests();
break;
default:
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
}
@@ -742,5 +745,18 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//--
return target;
}
public void checkUnpackedTests() throws Exception{
for (Test test: db.tests.Data.values()){
File testHome = test.getServerPath();
if (!testHome.exists()){
throw new RepositoryRefuseException(test.id+" не существует папка");
}
File testArchive = test.getArchive();
if (!testArchive.exists()){
throw new RepositoryRefuseException(test.id+" не существует архив");
}
}
response = new ServerExchangeUnit_2021(ServerCode.OK);
}
}

View File

@@ -61,7 +61,7 @@ public class MainMenuBar extends VisualiserMenuBar {
//-
setPreferredSize(new Dimension(0, 30));
//---
/*
/*
add(new MenuBarButton() {
{
setIcon("/Common/icons/Apply.png");
@@ -71,7 +71,7 @@ public class MainMenuBar extends VisualiserMenuBar {
});
}
});
*/
*/
add(new JSeparator());
add(MachineButton = new MenuBarButton() {
{