From 433070c15fdf710dae2b494c670d0f54509cdfec Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 27 Nov 2023 19:46:46 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D1=84=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B3=D0=B0=20=D1=81=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8F=D1=86=D0=B8=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                               | 9 +++------
 src/GlobalData/Module/UI/ModuleAnchestorForm.java | 7 +++++--
 src/ProjectData/LanguageName.java                 | 6 ++++--
 src/Repository/Component/Visualiser.java          | 2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8271ffbc..818f5899 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,11 @@
   </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/CreateTestFromCurrentProject.java" 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/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/LanguageName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/LanguageName.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/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/GlobalData/Module/UI/ModuleAnchestorForm.java b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
index ea1fd135..cb414a93 100644
--- a/src/GlobalData/Module/UI/ModuleAnchestorForm.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
@@ -36,9 +36,12 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
                 //проверим команду.
                 if (Result instanceof Makefile) {
                     //могут быть только flink/clink
-                    if (!command.equals("flink") && !command.equals("clink")) {
+                    if (!command.equals("flink") && !command.equals("clink")
+                    &&
+                            !command.equals("f") && !command.equals("c")
+                    ) {
                         Log.Writeln("При линковке DVM системой допустимы\n" +
-                                "только команды flink или clink");
+                                "только команды f,с, flink или clink");
                     }
                 } else if (Result instanceof Module) {
                     //могут быть только f/c
diff --git a/src/ProjectData/LanguageName.java b/src/ProjectData/LanguageName.java
index ad528436..9727c733 100644
--- a/src/ProjectData/LanguageName.java
+++ b/src/ProjectData/LanguageName.java
@@ -21,9 +21,11 @@ public enum LanguageName {
     public String getDVMLink() {
         switch (this) {
             case fortran:
-                return "flink";
+                return "f";
+                        //"flink";
             case c:
-                return "clink";
+                return "c";
+                        //"clink";
             default:
                 return "";
         }
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 7a4bc4fa..b0732292 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/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 = 1037;
+        version = 1038;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());