++

Дополнение обновлений

src/_VisualDVM/Constants.java

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1206;
+    public static final int version = 1207;
     public static final int planner_version = 15;
     public static final int testingMaxKernels = 64;
     //--
@@ -470,7 +470,7 @@ public class Constants {
             //</editor-fold>
     };
     public static Vector<String> admins_mails = new Vector_<>(
-            "sapfor.tracker@internet.ru",
+      "sapfor.tracker@internet.ru",
             "vmk-post@yandex.ru",
             "79854210702@ya.ru"
     );

src/_VisualDVM/Passes/All/DownloadSapforRepository.java

@@ -1,5 +1,6 @@
 package _VisualDVM.Passes.All;
 import Common.CommonConstants;
+import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.ProcessPass;
@@ -23,11 +24,19 @@ public class DownloadSapforRepository extends ProcessPass {
     private void synchronize(String src, File dst) throws Exception {
         File loadedFile = Paths.get(dst.getAbsolutePath(), CommonConstants.LOADED).toFile();
         if (loadedFile.exists()) {
-            PerformScript("cd " + dst.getAbsolutePath() +
-                    "\ngit pull ");
+            PerformScript("cd " + dst.getAbsolutePath() + "\n" +
+                    "git pull\n" +
+                    "cd " + Utils_.DQuotes(sapforHome) + "\n" +
+                    "GIT_SSL_NO_VERIFY=true git submodule update --init\n"
+            );
         } else {
             Utils.CleanDirectory(dst);
-            PerformScript("cd Repo\ngit clone " + src + "\n"); //export
+            PerformScript("cd Repo\n" +
+                    "git clone " +
+                    Utils_.DQuotes(src) + "\n" +
+                    "cd " + Utils_.DQuotes(sapforHome) + "\n" +
+                    "GIT_SSL_NO_VERIFY=true git submodule update --init\n"
+            ); //export
             FileUtils.write(loadedFile, "");
         }
     }

src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java

@@ -206,12 +206,5 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
     public int getCurrentSymbol() {
         return getCaretOffsetFromLineStart() + 1;
     }
-    @Override
-    public void applyTheme() {
-        float font_size = (float) getFont().getSize();
-        ((SPFEditorTheme) MainModule_.instance.getUI().getTheme()).getEditorTheme().apply(this);
-        setFont(getFont().deriveFont(font_size));
-        menu.applyTheme();
-        //меню связано с редактором. поэтому тема меняется только вместе с ним.
-    }
+
 }

src/_VisualDVM/TestingSystem/Common/TestingServer.java

@@ -587,6 +587,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     void GetSapforForCompilation() throws Exception {
         //1. Проверить наличие заказов от пользователя
         ServerSapfor serverSapfor = db.getSapforCopyForCompilation();
+
         if (serverSapfor == null) {
             //2 если нет. проверить есть ли свежие версии.
             int max_version = db.getInstalledSapforMaxVersion();
@@ -597,6 +598,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                     serverSapfor = new ServerSapfor();
                     serverSapfor.sender_name = "server";
                     serverSapfor.sender_address = Constants.MailAddress;
+                    serverSapfor.version = String.valueOf(current_version);
                     serverSapfor.state = ServerSapforState.Queued;
                     db.Insert(serverSapfor);
                 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java

@@ -237,9 +237,9 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         UpdateSapforState(ServerSapforState.SAPFORRepositorySynchronization);
         Utils.CleanDirectory(repo);
         Utils.startScript(repo, repo, "git_clone",
-                "git clone " + Constants.SAPFOR_REPOSITORY + " " +
-                        Utils_.DQuotes(repo_sapfor) +
-                        " 1>spf_out.txt 2>spf_err.txt\n").waitFor();
+                "git clone " + Constants.SAPFOR_REPOSITORY + " " +  Utils_.DQuotes(repo_sapfor) + " 1>spf_out.txt 2>spf_err.txt\n" +
+                        "cd " + Utils_.DQuotes(repo_sapfor) + "\n"+
+                        "GIT_SSL_NO_VERIFY=true git submodule update --init\n").waitFor();
     }
     void CompileSapfor() throws Exception {
         UpdateSapforState(ServerSapforState.Compilation);
@@ -276,7 +276,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
             //--
             sapfor.home_path = sapforHome.getAbsolutePath();
             sapfor.languageName = LanguageName.fortran;
-            sapfor.version = String.valueOf(current_version);
             //--
             File sapforBin = new File(sapforHome, "Sapfor_F");
             File sapforOut = new File(sapforHome, Constants.out_file);