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

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

7
.idea/workspace.xml generated
View File

@@ -9,9 +9,10 @@
<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 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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.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" />

View File

@@ -1,6 +1,6 @@
{ {
"Workspace": "E:\\Tests", "Workspace": "E:\\Tests",
"ProjectsSearchDirectory": "E:\\BUG", "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
"VisualiserPath": "C:\\Users\\misha\\Downloads", "VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
"Visualizer_2Path": "C:\\Users\\misha\\Documents", "Visualizer_2Path": "C:\\Users\\misha\\Documents",

View File

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

View File

@@ -1,8 +1,11 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Passes.Pass; import Common.Passes.Pass;
import Common.Visual.UI;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; import _VisualDVM.Passes.Server.TestingServerPass;
public class TestPass extends Pass { 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> unpackConfigurationsOld(SapforPackage sapforPackage){
LinkedHashMap<Integer,SapforConfiguration> res = new LinkedHashMap<>(); LinkedHashMap<Integer,SapforConfiguration> res = new LinkedHashMap<>();
@@ -27,7 +30,13 @@ public class TestPass extends Pass {
*/ */
@Override @Override
protected void body() throws Exception { 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 //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override @Override
public void GetVersionInfo() { public void GetVersionInfo() {
version = 1149; version = 1150;
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());

View File

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

View File

@@ -374,6 +374,9 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
Print("Получить максимальную установленную версию Sapfor"); Print("Получить максимальную установленную версию Sapfor");
GetSapforMaxVersion(); GetSapforMaxVersion();
break; break;
case TestCode:
checkUnpackedTests();
break;
default: default:
throw new RepositoryRefuseException("Неподдерживаемый код: " + code); throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
} }
@@ -742,5 +745,18 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//-- //--
return target; 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)); setPreferredSize(new Dimension(0, 30));
//--- //---
/* /*
add(new MenuBarButton() { add(new MenuBarButton() {
{ {
setIcon("/Common/icons/Apply.png"); setIcon("/Common/icons/Apply.png");
@@ -71,7 +71,7 @@ public class MainMenuBar extends VisualiserMenuBar {
}); });
} }
}); });
*/ */
add(new JSeparator()); add(new JSeparator());
add(MachineButton = new MenuBarButton() { add(MachineButton = new MenuBarButton() {
{ {