v++

.idea/workspace.xml

@@ -7,29 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_RemoveOmpDirectives.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/Directives.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_RemoveOmpDirectives.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Settings/SettingName.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageToKill/TasksPackageToKill.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -107,7 +93,7 @@
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
     <property name="extract.method.default.visibility" value="public" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/versions" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/Transformations" />
     <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -120,11 +106,11 @@
       <recent name="controls.Trees" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Transformations" />
-      <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons\Editor" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
       <recent name="TestingSystem.Group.GroupsDBTable" />
@@ -134,11 +120,11 @@
       <recent name="Common.Constants.Constants" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" />
       <recent name="E:\Visual_DVM_2020\src\Visual_DVM_2021\UI\Main" />
       <recent name="E:\Visual_DVM_2020\src\JAnalyzer" />
       <recent name="E:\Visual_DVM_2020\resources" />
-      <recent name="E:\Visual_DVM_2020\src" />
     </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="Visual_DVM_2021.Passes.UI" />

src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java

@@ -16,7 +16,7 @@ public class TransformationsMenu extends VisualiserMenu {
         add(new PassesSubMenu("Процедуры", "/icons/Menu/Functions.png",
                 Sapfor.getProceduresTransformationsCodes()));
         addSeparator();
-        add(new PassesSubMenu("DVM директивы", "/icons/Menu/Dvm.png",
+        add(new PassesSubMenu("Директивы", "/icons/Directives.png",
                 Sapfor.getDVMTransformationsCodes()));
         addSeparator();
         add(new PassesSubMenu("Интервалы", "/icons/Menu/Intervals.png",

src/Repository/Component/Sapfor/Sapfor.java

@@ -91,7 +91,8 @@ public abstract class Sapfor extends OSDComponent {
     public static PassCode_2021[] getDVMTransformationsCodes() {
         return new PassCode_2021[]{
                 PassCode_2021.SPF_RemoveDvmDirectivesToComments,
-                PassCode_2021.SPF_RemoveDvmDirectives
+                PassCode_2021.SPF_RemoveDvmDirectives,
+                PassCode_2021.SPF_RemoveOmpDirectives
         };
     }
     public static PassCode_2021[] getIntervalsTransformationsCodes() {
@@ -463,6 +464,7 @@ public abstract class Sapfor extends OSDComponent {
         //--
         res.add(PassCode_2021.SPF_RemoveDvmDirectives);
         res.add(PassCode_2021.SPF_RemoveDvmDirectivesToComments);
+        res.add(PassCode_2021.SPF_RemoveOmpDirectives);
         //--
         res.add(PassCode_2021.SPF_LoopEndDoConverterPass);
         res.add(PassCode_2021.SPF_LoopUnion);

src/Repository/Component/Visualiser.java

@@ -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 = 1030;
+        version = 1031;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());

src/Visual_DVM_2021/Passes/All/PublishComponent.java

@@ -54,7 +54,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
             }
             if (target.getComponentType().equals(ComponentType.Sapfor_F)) {
                 f.fields.cbAssemblyOnServer.setVisible(true);
-                f.fields.cbAssemblyOnServer.setSelected(true);
+                f.fields.cbAssemblyOnServer.setSelected(false);
             } else {
                 f.fields.cbAssemblyOnServer.setVisible(false);
                 f.fields.cbAssemblyOnServer.setSelected(false);

src/Visual_DVM_2021/Passes/All/SPF_RemoveOmpDirectives.java

@@ -0,0 +1,4 @@
+package Visual_DVM_2021.Passes.All;
+import Visual_DVM_2021.Passes.SapforTransformation;
+public class SPF_RemoveOmpDirectives extends SapforTransformation {
+}

src/Visual_DVM_2021/Passes/PassCode_2021.java

@@ -113,6 +113,7 @@ public enum PassCode_2021 {
     SPF_LoopUnrolling,
     SPF_ResolveCommonBlockConflicts,
     SPF_SharedMemoryParallelization,
+    SPF_RemoveOmpDirectives,
     RestoreSavedArrays,
     MassSelectArrays,
     DropSavedArrays,
@@ -305,6 +306,8 @@ public enum PassCode_2021 {
         switch (this) {
             case Undefined:
                 return "?";
+            case SPF_RemoveOmpDirectives:
+                return "Удаление Open MP директив";
             case CreateGroupFromDirectory:
                 return "Создать группу тестов из папки";
             case CreateTestFromDirectory: