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

рефакторинг. неудачные наименования классов, и остатки старых вариантов

Browse Source
This commit is contained in:
02090095
2023-10-08 01:06:55 +03:00
parent 49805f1293
commit eedddcd7d3
42 changed files with 295 additions and 1415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Common/Current.java
View File

@@ -8,7 +8,6 @@ import GlobalData.Machine.Machine;
import GlobalData.Makefile.Makefile;
import GlobalData.Module.Module;
import GlobalData.RemoteFile.RemoteFile;
import GlobalData.RemoteSapfor.RemoteSapfor;
import GlobalData.RunConfiguration.RunConfiguration;
import GlobalData.Tasks.CompilationTask.CompilationTask;
import GlobalData.Tasks.RunTask.RunTask;
@@ -102,9 +101,7 @@ public enum Current {
//-
DialogWindow,
//-
SapforTasksPackage,
PackageVersion,
RemoteSapfor,
SapforConfiguration,
SapforConfigurationCommand,
SapforTask,
@@ -267,13 +264,6 @@ public enum Current {
return get(Current.ComponentServerBackup) != null;
}
//-
public static boolean HasSapforTasksPackage() {
return get(Current.SapforTasksPackage) != null;
}
public static SapforTestingSystem.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
return (SapforTestingSystem.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
}
//-
public static DefaultMutableTreeNode getProjectNode() {
return (DefaultMutableTreeNode) get(Current.ProjectNode);
}
@@ -334,12 +324,6 @@ public enum Current {
public static boolean HasPackageVersion() {
return get(Current.PackageVersion) != null;
}
public static GlobalData.RemoteSapfor.RemoteSapfor getRemoteSapfor() {
return (RemoteSapfor) get(RemoteSapfor);
}
public static boolean HasRemoteSapfor() {
return get(Current.RemoteSapfor) != null;
}
public static boolean HasSapforConfiguration() {
return get(Current.SapforConfiguration) != null;
}
@@ -383,12 +367,13 @@ public enum Current {
public static GlobalData.SapforProfile.SapforProfile getSapforProfile() {
return (GlobalData.SapforProfile.SapforProfile) get(Current.SapforProfile);
}
public static boolean HasSapforScenario() {
public static boolean HasSapforTasksPackage() {
return get(Current.SapforScenario) != null;
}
public static SapforTestingSystem.SapforScenario.SapforScenario getSapforScenario() {
return (SapforTestingSystem.SapforScenario.SapforScenario) get(Current.SapforScenario);
public static SapforTestingSystem.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
return (SapforTestingSystem.SapforTasksPackage.SapforTasksPackage) get(Current.SapforScenario);
}
//сапфоры установленные на тестовый сервер.
public static boolean HasServerSapfor() {
return get(Current.ServerSapfor) != null;
}
@@ -422,12 +407,8 @@ public enum Current {
return "Команда конфигурации тестирования SAPFOR";
case SapforConfiguration:
return "Конфигурация тестирования SAPFOR";
case RemoteSapfor:
return "SAPFOR";
case PackageVersion:
return "Версия пакетного режима";
case SapforTasksPackage:
return "Пакет задач SAPFOR";
case TasksPackage:
return "Пакет задач";
case Credentials:

4
src/Common/Global.java
View File

@@ -13,7 +13,7 @@ import Repository.Component.Sapfor.MessagesServer;
import Repository.Component.Sapfor.Sapfor_F;
import Repository.Component.Sapfor.TransformationPermission;
import Repository.Server.ComponentsServer;
import SapforTestingSystem.SapforScenarioSupervisor.SapforScenarioSupervisor;
import SapforTestingSystem.SapforTasksPackageSupervisor.SapforTasksPackageSupervisor;
import TestingSystem.TestingServer;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -360,7 +360,7 @@ public class Global {
}
};
Log.ClearLog();
SapforScenarioSupervisor planner = new SapforScenarioSupervisor();
SapforTasksPackageSupervisor planner = new SapforTasksPackageSupervisor();
planner.Start();
}
//---

11
src/Common/UI/Menus_2023/RemoteSapforsMenuBar/RemoteSapforsMenuBar.java
View File

@@ -1,11 +0,0 @@
package Common.UI.Menus_2023.RemoteSapforsMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class RemoteSapforsMenuBar extends DataMenuBar {
public RemoteSapforsMenuBar() {
super("SAPFOR",
PassCode_2021.AddSapfor,
PassCode_2021.EditSapfor,
PassCode_2021.DeleteSapfor);
}
}

8
src/Common/UI/Menus_2023/SapforScenariosBar/SapforScenariosBar.java
View File

@@ -1,8 +0,0 @@
package Common.UI.Menus_2023.SapforScenariosBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforScenariosBar extends DataMenuBar {
public SapforScenariosBar() {
super("сценарии", PassCode_2021.DeleteSapforScenario);
}
}

8
src/Common/UI/Menus_2023/SapforTasksMenuBar/SapforTasksMenuBar.java
View File

@@ -1,8 +0,0 @@
package Common.UI.Menus_2023.SapforTasksMenuBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforTasksMenuBar extends DataMenuBar {
public SapforTasksMenuBar() {
super("задачи", PassCode_2021.OpenSapforTest);
}
}

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

@@ -1,7 +1,8 @@
package Common.UI.Menus_2023.SapforTasksPackagesBar;
import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforTasksPackagesBar extends DataMenuBar {
public SapforTasksPackagesBar() {
super("пакеты задач");
super("сценарии", PassCode_2021.DeleteSapforScenario);
}
}

15
src/Common/UI/UI.java
View File

@@ -15,12 +15,9 @@ import Common.UI.Menus_2023.MainMenuBar.MainMenuBar;
import Common.UI.Menus_2023.MainMenuBar.MainWindow;
import Common.UI.Menus_2023.MakefilesMenuBar.MakefilesMenuBar;
import Common.UI.Menus_2023.ModulesMenuBar.ModulesMenuBar;
import Common.UI.Menus_2023.RemoteSapforsMenuBar.RemoteSapforsMenuBar;
import Common.UI.Menus_2023.RunConfigurationsMenuBar.RunConfigurationsMenuBar;
import Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar.SapforConfigurationCommandsMenuBar;
import Common.UI.Menus_2023.SapforConfigurationsMenuBar.SapforConfigurationsMenuBar;
import Common.UI.Menus_2023.SapforScenariosBar.SapforScenariosBar;
import Common.UI.Menus_2023.SapforTasksMenuBar.SapforTasksMenuBar;
import Common.UI.Menus_2023.SapforTasksPackagesBar.SapforTasksPackagesBar;
import Common.UI.Menus_2023.ServerSapforsBar.ServerSapforsBar;
import Common.UI.Menus_2023.SubscribersMenuBar.SubscribersMenuBar;
@@ -50,7 +47,6 @@ import GlobalData.Makefile.MakefilesDBTable;
import GlobalData.Module.ModulesDBTable;
import GlobalData.RemoteFile.UI.RemoteFileChooser;
import GlobalData.RemoteFile.UI.RemoteFileRenderer;
import GlobalData.RemoteSapfor.RemoteSapforsDBTable;
import GlobalData.RunConfiguration.RunConfigurationsDBTable;
import GlobalData.SapforProfile.SapforProfilesDBTable;
import GlobalData.Settings.SettingName;
@@ -71,14 +67,12 @@ import ProjectData.SapforData.Variants.VariantsSet;
import Repository.BugReport.BugReportsDBTable;
import Repository.Component.UI.ComponentsForm;
import Repository.Subscribes.SubsribersDBTable;
import SapforTestingSystem.SapforScenario.SapforScenariosDBTable;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
import TestingSystem.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.GroupsDBTable;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import SapforTestingSystem.SapforTask.SapforTasksDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import TestingSystem.Tasks.TestRunTasksDBTable;
import TestingSystem.TasksPackage.TasksPackageDBTable;
import TestingSystem.Test.TestDBTable;
@@ -234,10 +228,7 @@ public class UI {
//---->>
menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
menuBars.put(SapforConfigurationCommandsDBTable.class, new SapforConfigurationCommandsMenuBar());
menuBars.put(RemoteSapforsDBTable.class, new RemoteSapforsMenuBar());
menuBars.put(SapforScenariosDBTable.class, new SapforScenariosBar());
menuBars.put(SapforTasksPackagesDBTable.class, new SapforTasksPackagesBar());
menuBars.put(SapforTasksDBTable.class, new SapforTasksMenuBar());
//---->>
menuBars.put(RegionsSet.class, new DataMenuBar("области распараллеливания"));
menuBars.put(ArraysSet.class, new DataMenuBar("массивы"));

2
src/Common/Utils/Utils.java
View File

@@ -712,7 +712,7 @@ public class Utils {
public static Process startScript(File scriptDirectory, File targetDirectory, String name, String scriptText) throws Exception {
return startScript(scriptDirectory, targetDirectory, name, scriptText, null);
}
public static Process startScript_(File scriptDirectory, File targetDirectory, String name, String scriptText) throws Exception {
public static Process createScript(File scriptDirectory, File targetDirectory, String name, String scriptText) throws Exception {
//->
File scriptFile = Paths.get(scriptDirectory.getAbsolutePath(), name + (Global.isWindows ? ".bat" : "")).toFile();
FileUtils.write(scriptFile, "cd " + Utils.DQuotes(targetDirectory.getAbsolutePath()) + "\n" + scriptText);