diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 298eb1b7..3a745c79 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,19 +7,138 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
@@ -61,7 +180,7 @@
-
+
@@ -117,11 +236,11 @@
+
-
diff --git a/src/Common/Current.java b/src/Common/Current.java
index d7045bd9..9d9f44ca 100644
--- a/src/Common/Current.java
+++ b/src/Common/Current.java
@@ -18,12 +18,12 @@ import ProjectData.SapforData.Functions.FuncInfo;
import ProjectData.SapforData.Regions.ParallelRegion;
import Repository.BugReport.BugReport;
import Repository.Subscribes.Subscriber;
-import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
-import TestingSystem.Configuration.Configuration;
-import TestingSystem.Tasks.TestCompilationTask;
-import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.Test.Test;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.UI.PassForm;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -224,22 +224,22 @@ public enum Current {
public static boolean HasGroup() {
return get(Current.Group) != null;
}
- public static TestingSystem.Group.Group getGroup() {
- return (TestingSystem.Group.Group) get(Current.Group);
+ public static TestingSystem.Common.Group.Group getGroup() {
+ return (TestingSystem.Common.Group.Group) get(Current.Group);
}
//--
public static boolean HasConfiguration() {
return get(Current.Configuration) != null;
}
- public static TestingSystem.Configuration.Configuration getConfiguration() {
+ public static TestingSystem.DVM.Configuration.Configuration getConfiguration() {
return (Configuration) get(Current.Configuration);
}
public static SapforConfiguration getSapforConfiguration() {
- return (SapforTestingSystem.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
+ return (TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
}
//--
public static Test getTest() {
- return (TestingSystem.Test.Test) get(Current.Test);
+ return (TestingSystem.Common.Test.Test) get(Current.Test);
}
public static boolean HasTest() {
return get(Current.Test) != null;
@@ -248,7 +248,7 @@ public enum Current {
return get(Current.Version) != null;
}
public static TestCompilationTask getTestCompilationTask() {
- return (TestingSystem.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
+ return (TestingSystem.DVM.Tasks.TestCompilationTask) get(Current.TestCompilationTask);
}
public static boolean HasTestCompilationTask() {
return get(Current.TestCompilationTask) != null;
@@ -257,7 +257,7 @@ public enum Current {
return get(Current.TestRunTask) != null;
}
public static TestRunTask getTestRunTask() {
- return (TestingSystem.Tasks.TestRunTask) get(Current.TestRunTask);
+ return (TestingSystem.DVM.Tasks.TestRunTask) get(Current.TestRunTask);
}
public static RemoteFile getComponentServerBackup() {
return (RemoteFile) get(Current.ComponentServerBackup);
@@ -332,8 +332,8 @@ public enum Current {
public static boolean HasSapforTask() {
return get(Current.SapforTask) != null;
}
- public static SapforTestingSystem.SapforTask.SapforTask getSapforTask() {
- return (SapforTestingSystem.SapforTask.SapforTask) get(Current.SapforTask);
+ public static TestingSystem.SAPFOR.SapforTask.SapforTask getSapforTask() {
+ return (TestingSystem.SAPFOR.SapforTask.SapforTask) get(Current.SapforTask);
}
public static ProjectData.ProjectView getProjectView() {
return (ProjectData.ProjectView) get(ProjectView);
@@ -360,8 +360,8 @@ public enum Current {
public static boolean CheckID(Current name, int id) {
return (get(name) != null) && (((iDBObject) get(name)).id == id);
}
- public static SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
- return (SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
+ public static TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
+ return (TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
}
public static boolean HasSapforProfile() {
return get(Current.SapforProfile) != null;
@@ -372,15 +372,15 @@ public enum Current {
public static boolean HasSapforTasksPackage() {
return get(Current.SapforTasksPackage) != null;
}
- public static SapforTestingSystem.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
- return (SapforTestingSystem.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
+ public static TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
+ return (TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
}
//сапфоры установленные на тестовый сервер.
public static boolean HasServerSapfor() {
return get(Current.ServerSapfor) != null;
}
- public static SapforTestingSystem.ServerSapfor.ServerSapfor getServerSapfor() {
- return (SapforTestingSystem.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
+ public static TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
+ return (TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) get(Current.ServerSapfor);
}
//--------------------------------------------
public String getDescription() {
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 09927ac1..3613eed8 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -13,8 +13,8 @@ import Repository.Component.Sapfor.MessagesServer;
import Repository.Component.Sapfor.Sapfor_F;
import Repository.Component.Sapfor.TransformationPermission;
import Repository.Server.ComponentsServer;
-import SapforTestingSystem.PackageModeSupervisor.PackageModeSupervisor;
-import TestingSystem.TestingServer;
+import TestingSystem.SAPFOR.PackageModeSupervisor;
+import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.UI.Interface.Loggable;
diff --git a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
index ef6cb1dc..c37f0819 100644
--- a/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
+++ b/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java
@@ -3,7 +3,7 @@ import Common.Global;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton;
import Common.Utils.Utils;
-import TestingSystem.Group.GroupInterface;
+import TestingSystem.Common.Group.GroupsDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
@@ -21,13 +21,13 @@ public class GroupsMenuBar extends DataMenuBar {
setToolTipText("Отображать только группы тестов авторства пользователя");
Mark();
addActionListener(e -> {
- GroupInterface.filterMyOnly = !GroupInterface.filterMyOnly;
+ GroupsDBTable.filterMyOnly = !GroupsDBTable.filterMyOnly;
Mark();
Global.testingServer.db.groups.ShowUI();
});
}
public void Mark() {
- setIcon(Utils.getIcon(GroupInterface.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
+ setIcon(Utils.getIcon(GroupsDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
}
});
}
diff --git a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
index adc72c67..c54a3705 100644
--- a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
+++ b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
@@ -6,7 +6,7 @@ import Common.UI.Menus_2023.VisualiserMenuBar;
import Common.UI.Themes.VisualiserFonts;
import Common.UI.UI;
import Common.Utils.Utils;
-import TestingSystem.TestingServer;
+import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 8671bbb9..6850a264 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -57,7 +57,7 @@ import GlobalData.Tasks.RunTask.RunTasksDBTable;
import GlobalData.User.UsersDBTable;
import ProjectData.DBArray.ArraysDBTable;
import ProjectData.Files.UI.FilesTreeCellRenderer;
-import SapforTestingSystem.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
+import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import ProjectData.Project.UI.VersionsTreeCellRenderer;
import ProjectData.SapforData.Arrays.ArraysSet;
import ProjectData.SapforData.Arrays.UI.DimensionRenderer;
@@ -69,16 +69,16 @@ import ProjectData.SapforData.Variants.VariantsSet;
import Repository.BugReport.BugReportsDBTable;
import Repository.Component.UI.ComponentsForm;
import Repository.Subscribes.SubsribersDBTable;
-import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
-import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
-import SapforTestingSystem.SapforTask.SapforTasksDBTable;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
-import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
-import TestingSystem.Configuration.UI.ConfigurationDBTable;
-import TestingSystem.Group.GroupsDBTable;
-import TestingSystem.Tasks.TestRunTasksDBTable;
-import TestingSystem.TasksPackage.TasksPackageDBTable;
-import TestingSystem.Test.TestDBTable;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
+import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
+import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackagesDBTable;
+import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
+import TestingSystem.DVM.Configuration.UI.ConfigurationDBTable;
+import TestingSystem.Common.Group.GroupsDBTable;
+import TestingSystem.DVM.Tasks.TestRunTasksDBTable;
+import TestingSystem.DVM.TasksPackage.TasksPackageDBTable;
+import TestingSystem.Common.Test.TestDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.UI.Interface.DebugWindow;
import Visual_DVM_2021.UI.Interface.VersionsWindow;
diff --git a/src/GlobalData/Tasks/RunTask/RunTask.java b/src/GlobalData/Tasks/RunTask/RunTask.java
index a743a1f6..94b4c015 100644
--- a/src/GlobalData/Tasks/RunTask/RunTask.java
+++ b/src/GlobalData/Tasks/RunTask/RunTask.java
@@ -10,7 +10,7 @@ import GlobalData.Tasks.CompilationTask.CompilationTask;
import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
-import TestingSystem.Tasks.TestRunTaskInterface;
+import TestingSystem.DVM.Tasks.TestRunTaskInterface;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;
diff --git a/src/GlobalData/User/User.java b/src/GlobalData/User/User.java
index b342b2af..a5c27c5a 100644
--- a/src/GlobalData/User/User.java
+++ b/src/GlobalData/User/User.java
@@ -3,7 +3,7 @@ import Common.Constants;
import Common.Current;
import Common.Database.iDBObject;
import GlobalData.Machine.Machine;
-import TestingSystem.UserConnection;
+import TestingSystem.DVM.UserConnection;
import Visual_DVM_2021.Passes.SSH.ConnectionPass;
import com.sun.org.glassfish.gmbal.Description;
diff --git a/src/ProjectData/Files/DBProjectFile.java b/src/ProjectData/Files/DBProjectFile.java
index 7968f80f..c301a693 100644
--- a/src/ProjectData/Files/DBProjectFile.java
+++ b/src/ProjectData/Files/DBProjectFile.java
@@ -472,4 +472,19 @@ public class DBProjectFile extends ProjectFile {
}
return res;
}
+ //---
+ public String getStyleOptions() {
+ if (languageName == LanguageName.fortran) {
+ switch (style) {
+ case fixed:
+ case extended:
+ return "-FI";
+ case free:
+ return "-f90";
+ case none:
+ break;
+ }
+ }
+ return "";
+ }
}
\ No newline at end of file
diff --git a/src/ProjectData/Project/db_project_info.java b/src/ProjectData/Project/db_project_info.java
index 0302b294..69084b60 100644
--- a/src/ProjectData/Project/db_project_info.java
+++ b/src/ProjectData/Project/db_project_info.java
@@ -31,9 +31,8 @@ import ProjectData.SapforData.Regions.ParallelRegion;
import ProjectData.SapforData.Regions.RegionsSet;
import ProjectData.SapforData.Variants.ParallelVariant;
import ProjectData.SapforData.Variants.VariantsSet;
-import TestingSystem.Test.ProjectFiles_json;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestInterface;
+import TestingSystem.Common.Test.ProjectFiles_json;
+import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassException;
import com.mxgraph.swing.mxGraphComponent;
@@ -212,7 +211,7 @@ public class db_project_info extends DBObject {
}
//для запуска тестов.
public db_project_info(Test test) throws Exception {
- Home = TestInterface.getServerPath(test);
+ Home = test.getServerPath();
//-
CheckVisualiserDirectories();
db = new ProjectDatabase(this);
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index 9dbfc26b..9cfeff97 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -79,4 +79,5 @@ public enum ServerCode {
OLD,
//-
PublishAIObject, //публикация объекта с автоинкрементом.
+ PublishTestProject, //отправка теста на сервер в архиве.
}
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index 956c7960..22e3f58d 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -4,9 +4,9 @@ import Common.Global;
import Common.Utils.Utils;
import GlobalData.Tasks.TaskState;
import ProjectData.Messages.Errors.MessageError;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.Json.SapforVersion_json;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
+import TestingSystem.SAPFOR.Json.SapforVersion_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;
diff --git a/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java b/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java
deleted file mode 100644
index 33d38e0d..00000000
--- a/src/SapforTestingSystem/ServerSapfor/ServerSapforsDBTable.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package SapforTestingSystem.ServerSapfor;
-import Common.Current;
-import Common.Database.iDBTable;
-import Common.UI.DataSetControlForm;
-import Common.UI.Tables.TableRenderers;
-public class ServerSapforsDBTable extends iDBTable {
- public ServerSapforsDBTable() {
- super(ServerSapfor.class);
- }
- @Override
- public String getSingleDescription() {
- return "SAPFOR";
- }
- @Override
- public String getPluralDescription() {
- return "SAPFOR";
- }
- @Override
- public Current CurrentName() {
- return Current.ServerSapfor;
- }
- @Override
- public String[] getUIColumnNames() {
- return new String[]{"версия", "дата сборки"};
- }
- @Override
- public Object getFieldAt(ServerSapfor object, int columnIndex) {
- switch (columnIndex) {
- case 1:
- return object.version;
- case 2:
- return object.getBuildDate();
- }
- return null;
- }
- @Override
- protected DataSetControlForm createUI() {
- return new DataSetControlForm(this) {
- @Override
- protected void AdditionalInitColumns() {
- columns.get(0).setVisible(false);
- columns.get(2).setRenderer(TableRenderers.RendererDate);
- }
- };
- }
- //---
- /*
- @Override
- public DBObjectDialog getDialog() {
- return new DBObjectDialog(RemoteSapforFields.class) {
- @Override
- public void validateFields() {
- //
- String home = fields.tfHome.getText();
- if (!home.isEmpty()) {
- if (home.startsWith("/")) {
- if (Utils.ContainsCyrillic(home))
- Log.Writeln("Расположение системы SAPFOR не может содержать кириллицу");
- else {
- new PathValidator(home, "Расположение системы SAPFOR", Log).Validate();
- }
- } else
- Log.Writeln("Расположение системы SAPFOR может быть либо пустой строкой, либо путём к файлу");
- }
- //
- //
- String call_command = fields.tfCallCommand.getText();
- if (call_command.isEmpty()) Log.Writeln("Команда вызова системы SAPFOR не может быть пустой");
- else if (Utils.ContainsCyrillic(call_command))
- Log.Writeln("Команда вызова системы SAPFOR не может содержать кириллицу");
- else {
- switch (call_command.charAt(0)) {
- case ' ':
- Log.Writeln("Команда вызова системы SAPFOR не может начинаться с пробела.");
- break;
- case '/':
- if (call_command.endsWith("/"))
- Log.Writeln("Каталог не может быть указан в качестве команды.");
- else new PathValidator(call_command, "Команда вызова системы SAPFOR", Log).Validate();
- break;
- default:
- //это команда.
- //самое опасное место. теоретически тут можно ввести любую команду ОС, в том числе rm -rf
- if (call_command.contains(" "))
- Log.Writeln("Прямая команда вызова системы SAPFOR не может содержать пробелы");
- if (!call_command.contains("+") && Utils.ContainsForbiddenName(call_command))
- Log.Writeln("Прямая команда вызова системы SAPFOR содержит запрещённые символы");
- else {
- if (Utils.isLinuxSystemCommand(call_command))
- Log.Writeln(Utils.DQuotes(call_command) + " является системной командой Linux");
- }
- break;
- }
- }
- //
- }
- @Override
- public void fillFields() {
- fields.tfDescription.setText(Result.description);
- fields.tfCallCommand.setText(Result.call_command);
- fields.tfHome.setText(Result.home_path);
- UI.TrySelect(fields.cbLanguageName, Result.languageName);
- fields.tfVersion.setText(Result.version);
- fields.events_on = true;
- }
- @Override
- public void ProcessResult() {
- Result.machine_id = Current.getMachine().id;
- Result.description = fields.tfDescription.getText();
- Result.call_command = fields.tfCallCommand.getText();
- Result.home_path = fields.tfHome.getText();
- Result.languageName = (LanguageName) fields.cbLanguageName.getSelectedItem();
- Result.version = fields.tfVersion.getText();
- }
- @Override
- public int getDefaultHeight() {
- return 300;
- }
- };
- */
-}
diff --git a/src/SapforTestingSystem/TaskThread.java b/src/SapforTestingSystem/TaskThread.java
index ef64d6ac..0cce3301 100644
--- a/src/SapforTestingSystem/TaskThread.java
+++ b/src/SapforTestingSystem/TaskThread.java
@@ -1,6 +1,6 @@
package SapforTestingSystem;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.SapforTask.SapforTask;
+import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
+import TestingSystem.SAPFOR.SapforTask.SapforTask;
import java.io.File;
public class TaskThread extends Thread {
diff --git a/src/TestingSystem/Group/GroupInterface.java b/src/TestingSystem/Common/Group/Group.java
similarity index 60%
rename from src/TestingSystem/Group/GroupInterface.java
rename to src/TestingSystem/Common/Group/Group.java
index ebeab1dc..3b466a14 100644
--- a/src/TestingSystem/Group/GroupInterface.java
+++ b/src/TestingSystem/Common/Group/Group.java
@@ -1,55 +1,33 @@
-package TestingSystem.Group;
+package TestingSystem.Common.Group;
import Common.Current;
+import Common.Database.DBObject;
+import Common.Database.riDBObject;
import Common.Global;
+import Common.UI.UI;
import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.LanguageName;
import ProjectData.Project.db_project_info;
+import TestingSystem.Common.Test.TestType;
+import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap;
import java.util.Vector;
-//dynamic cats возможен через рефлексию.
-//https://stackoverflow.com/questions/2127318/java-how-can-i-do-dynamic-casting-of-a-variable-from-one-type-to-another
-public class GroupInterface {
- //-
- public static boolean filterMyOnly = false;
+public class Group extends riDBObject {
+ @Description("DEFAULT 'Default'")
+ public TestType type = TestType.Default;
+ @Description("DEFAULT 'fortran'")
+ public LanguageName language = LanguageName.fortran;
//--
- public static boolean isVisible(Group object) {
- return (!filterMyOnly || Current.getAccount().email.equals(object.sender_address)) &&
- Global.testingServer.db.groups.applyFilters(object);
- }
- public static String getStyleOptions(DBProjectFile program) {
- if (program.languageName == LanguageName.fortran) {
- switch (program.style) {
- case fixed:
- case extended:
- return "-FI";
- case free:
- return "-f90";
- case none:
- break;
- }
- }
- return "";
- }
- public static String getLanguageCompileCommand(LanguageName language) {
- switch (language) {
- case fortran:
- return "f";
- case c:
- return "c";
- }
- return "";
- }
- public static String getLanguageLinkCommand(LanguageName language) {
- switch (language) {
- case fortran:
- return "flink";
- case c:
- return "clink";
- }
- return "";
+ @Description("IGNORE")
+ public LinkedHashMap testsFiles = new LinkedHashMap<>(); //транспорт.
+ //--
+ @Override
+ public boolean isVisible() {
+ return (!GroupsDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) &&
+ Global.testingServer.db.groups.applyFilters(this);
}
+ //-
public static void generateForLanguage(
String dvm_drv,
LinkedHashMap> programs,
@@ -75,7 +53,7 @@ public class GroupInterface {
String.join(" ",
Utils.MFVar(LANG_ + "COMMAND"),
Utils.MFVar(LANG_ + "FLAGS"),
- getStyleOptions(program),
+ program.getStyleOptions(),
"-c",
program.getQSourceName(),
"-o",
@@ -85,7 +63,7 @@ public class GroupInterface {
}
titles.add(String.join("\n",
LANG_ + "COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
- getLanguageCompileCommand(language),
+ language.getDVMCompile(),
LANG_ + "FLAGS=" + flags_in,
LANG_ + "OBJECTS=" + String.join(" ", module_objects),
""
@@ -94,7 +72,7 @@ public class GroupInterface {
bodies.add(module_body);
}
}
- public static String GenerateMakefile(Group object, db_project_info project, String dvm_drv, String flags_in) {
+ public String GenerateMakefile(db_project_info project, String dvm_drv, String flags_in) {
//----->>
LinkedHashMap> programs = project.getPrograms();
Vector titles = new Vector<>();
@@ -102,11 +80,11 @@ public class GroupInterface {
Vector bodies = new Vector<>();
String binary = Utils.DQuotes("0");
//----->>
- generateForLanguage(dvm_drv, programs, object.language, titles, objects, bodies, flags_in);
+ generateForLanguage(dvm_drv, programs, language, titles, objects, bodies, flags_in);
//----->>
return String.join("\n",
"LINK_COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
- getLanguageLinkCommand(object.language),
+ language.getDVMLink(),
"LINK_FLAGS=" + flags_in + "\n",
String.join("\n", titles),
"all: " + binary,
@@ -114,7 +92,27 @@ public class GroupInterface {
"\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary,
String.join(" ", bodies));
}
- public static String getSummary(Group group) {
- return group.description + " " + group.language.getDescription();
+ public String getSummary() {
+ return description + " " + language.getDescription();
+ }
+ //-
+
+ @Override
+ public void SynchronizeFields(DBObject src) {
+ super.SynchronizeFields(src);
+ Group g = (Group) src;
+ type = g.type;
+ language = g.language;
+ }
+ public Group(Group group) {
+ this.SynchronizeFields(group);
+ }
+ public Group() {
+ }
+ @Override
+ public void select(boolean flag) {
+ super.select(flag);
+ if (Current.hasUI())
+ UI.getMainWindow().ShowCheckedTestsCount();
}
}
diff --git a/src/TestingSystem/Group/GroupsDBTable.java b/src/TestingSystem/Common/Group/GroupsDBTable.java
similarity index 96%
rename from src/TestingSystem/Group/GroupsDBTable.java
rename to src/TestingSystem/Common/Group/GroupsDBTable.java
index 2f86e571..13b93324 100644
--- a/src/TestingSystem/Group/GroupsDBTable.java
+++ b/src/TestingSystem/Common/Group/GroupsDBTable.java
@@ -1,4 +1,4 @@
-package TestingSystem.Group;
+package TestingSystem.Common.Group;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
@@ -7,15 +7,16 @@ import Common.UI.Menus_2023.VisualiserMenu;
import Common.UI.UI;
import Common.UI.Windows.Dialog.DBObjectDialog;
import ProjectData.LanguageName;
-import TestingSystem.Group.UI.GroupFields;
-import TestingSystem.Test.Test;
-import TestingSystem.Test.TestType;
+import TestingSystem.Common.Group.UI.GroupFields;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.Test.TestType;
import javax.swing.*;
import java.util.LinkedHashMap;
import java.util.Vector;
//-
public class GroupsDBTable extends iDBTable {
+ public static boolean filterMyOnly = false;
public Vector> typeFilters;
public Vector> languageFilters;
//------------------------------------------------>>>
diff --git a/src/TestingSystem/Group/UI/GroupFields.form b/src/TestingSystem/Common/Group/UI/GroupFields.form
similarity index 98%
rename from src/TestingSystem/Group/UI/GroupFields.form
rename to src/TestingSystem/Common/Group/UI/GroupFields.form
index abc7a5d1..d2211196 100644
--- a/src/TestingSystem/Group/UI/GroupFields.form
+++ b/src/TestingSystem/Common/Group/UI/GroupFields.form
@@ -1,5 +1,5 @@
-