++

добавление учета пробелов в сравнение

.idea/workspace.xml

@@ -9,10 +9,9 @@
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/Common/Utils/IntegerPairJson.java

@@ -5,16 +5,16 @@ public class IntegerPairJson {
     public int key;
     @Expose
     public int value;
-    public int getKey() {
-        return key;
-    }
-    public int getValue() {
-        return value;
-    }
     public IntegerPairJson(int key_in, int value_in) {
         key = key_in;
         value = value_in;
     }
     public IntegerPairJson() {
     }
+    public int getKey() {
+        return key;
+    }
+    public int getValue() {
+        return value;
+    }
 }

src/Common/Visual/UI.java

@@ -1,6 +1,5 @@
 package Common.Visual;
 import Common.MainModule_;
-import Common.Utils.Utils_;
 
 import javax.swing.*;
 import javax.swing.event.ChangeListener;

src/_VisualDVM/Constants.java

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1254;
+    public static final int version = 1255;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--

src/_VisualDVM/Passes/All/CombineFiles.java

@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
-import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
 import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
@@ -55,9 +54,8 @@ public class CombineFiles extends Transformation {
         Vector<String> result_lines = new Vector<>();
         Vector<String> all_includes = new Vector<>();
         //-----------------------------
-
         result_lines.add("!-Found " + target.allIncludes.size() + " headers");
-        System.out.println("found "+target.allIncludes.size()+" headers");
+        System.out.println("found " + target.allIncludes.size() + " headers");
         for (String name : target.allIncludes) {
             all_includes.add("      include " + Utils_.Quotes(Utils_.toU(name))); //---
             result_lines.add("!      include " + Utils_.Quotes(Utils_.toU(name)));
@@ -88,7 +86,6 @@ public class CombineFiles extends Transformation {
                 result_lines.addAll(FileUtils.readLines(target.db.files.Data.get(name).file));
             }
         }
-
         FileUtils.writeLines(result, result_lines, false);
         //-------------------------------
         //теперь скопировать остальные файлы

src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java

@@ -1,16 +1,11 @@
 package _VisualDVM.Passes.All;
-import Common.Utils.Index;
 import Common.Utils.Utils_;
-import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.Arrays.ArrayDecl;
 import _VisualDVM.ProjectData.SapforData.Arrays.ArraysJson;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
-
-import javax.rmi.CORBA.Util;
-import java.math.BigInteger;
 public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
     @Override
     public String phase() {
@@ -32,11 +27,11 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
     @Override
     public void unpack(String packed) throws Exception {
         ArraysJson arraysJson = Utils_.gson.fromJson(packed, ArraysJson.class);
-        for (ProjectArray array: arraysJson.allArrays){
+        for (ProjectArray array : arraysJson.allArrays) {
             array.Init();
             target.declaratedArrays.put(array.id, array);
             //--
-            for (ArrayDecl decl: array.declPlaces){
+            for (ArrayDecl decl : array.declPlaces) {
                 DBProjectFile projectFile = target.db.files.get(decl.file);
                 projectFile.array_decls.add(decl);
             }

src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java

@@ -1,9 +1,7 @@
 package _VisualDVM.Passes.All;
-import Common.Utils.Index;
 import Common.Utils.Utils_;
 import Common.Utils.Vector_;
 import Common.Visual.Controls.PassControl;
-import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
@@ -27,7 +25,7 @@ public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
     @Override
     protected void unpack(String packed) throws Exception {
         RegionsJson regionsJson = Utils_.gson.fromJson(packed, RegionsJson.class);
-        for (ParallelRegion parallelRegion: regionsJson.allRegions){
+        for (ParallelRegion parallelRegion : regionsJson.allRegions) {
             parallelRegion.Init();
             target.parallelRegions.put(parallelRegion.regionId, parallelRegion);
         }

src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java

@@ -1,5 +1,4 @@
 package _VisualDVM.Passes.All;
-import Common.Utils.Index;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
@@ -13,7 +12,7 @@ public class SPF_GetArrayDistributionOnlyRegions extends SapforAnalysis {
     @Override
     protected void unpack(String packed) throws Exception {
         RegionsJson regionsJson = Utils_.gson.fromJson(packed, RegionsJson.class);
-        for (ParallelRegion parallelRegion: regionsJson.allRegions){
+        for (ParallelRegion parallelRegion : regionsJson.allRegions) {
             parallelRegion.Init();
             target.parallelRegions.put(parallelRegion.regionId, parallelRegion);
         }

src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java

@@ -22,13 +22,13 @@ public class SPF_GetArrayLinks extends SilentSapforPass {
             id_2|number_2|link_id1|link_id2|link_id3
          */
         //эту инфу суем в список объявленных массивов, чтобы не плодить лишних таблиц.
-        System.out.println("packed="+ Utils_.Brackets(packed));
+        System.out.println("packed=" + Utils_.Brackets(packed));
         ProjectArray current_array = null;
         ArrayLinksJson links = Utils_.gson.fromJson(packed, ArrayLinksJson.class);
-        for (ArrayLinkJson link: links.allLinks){
+        for (ArrayLinkJson link : links.allLinks) {
             current_array = target.declaratedArrays.get(link.id);
             current_array.links.clear();
-            for (long link_id: link.links){
+            for (long link_id : link.links) {
                 current_array.links.put(link_id, target.declaratedArrays.get(link_id));
             }
         }

src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java

@@ -55,17 +55,16 @@ public class SPF_GetGCovInfo extends SilentSapforPass {
     }
     protected void unpack(String packed) throws Exception {
         GCOVJson allJson = Utils_.gson.fromJson(packed, GCOVJson.class);
-        for (FileGCOVJson fileJson: allJson.allGCov){
+        for (FileGCOVJson fileJson : allJson.allGCov) {
             fileJson.file = Utils_.toW(fileJson.file);
             //--
             DBProjectFile projectFile = target.db.files.get(fileJson.file);
-            for (LineGCOVJson lineJson: fileJson.lines){
+            for (LineGCOVJson lineJson : fileJson.lines) {
                 if (lineJson.line > 0) {
                     int v_line = lineJson.line - 1;
                     long v_execution = (lineJson.execution >= 0) ? lineJson.execution : 0;
                     if (!projectFile.gcov_info.line_info.containsKey(v_line)) {
                         projectFile.gcov_info.add_line(v_line, v_execution);
-
                     }
                 }
             }

src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java

@@ -44,8 +44,8 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
             FileInfo fileInfo = new FileInfo(fileIncludesJson.file);
             //---
             DBProjectFile file = target.db.files.get(fileIncludesJson.file);
-            System.out.println("addicted file = "+Utils_.Brackets(fileIncludesJson.file));
+            System.out.println("addicted file = " + Utils_.Brackets(fileIncludesJson.file));
-            System.out.println("found dependencies :"+fileIncludesJson.includes.size());
+            System.out.println("found dependencies :" + fileIncludesJson.includes.size());
             ///  UI.Info("+");
             for (Include include : fileIncludesJson.includes) {
                 //--
@@ -56,7 +56,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
                 fileInfo.dependencies.add(include);
                 if (!target.allIncludes.contains(include.dependencyFileName))
                     target.allIncludes.add(include.dependencyFileName);
-                if (target.db.files.containsKey(include.dependencyFileName)){
+                if (target.db.files.containsKey(include.dependencyFileName)) {
                     //- определение типов языков инклудов по файлу куда они цепляютс.
                     if (!file.dependencies.contains(include.dependencyFileName)) {
                         file.dependencies.add(include.dependencyFileName);
@@ -70,9 +70,8 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
                         if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(include_file.name))
                             update_current = true;
                     }
-
+                } else {
-                }else {
+                    System.out.println(Utils_.Brackets(include.dependencyFileName) + " не существует!");
-                    System.out.println(Utils_.Brackets(include.dependencyFileName)+" не существует!");
                 }
             }
             //----

src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java

@@ -42,7 +42,6 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
         }
         return false;
     }
-
     /*
     if (super.canStart(args)) {
         if (target.numAddicted <= 0) {

src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java

@@ -58,7 +58,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
     }
     @Override
     protected void unpackMessages() throws Exception {
-        System.out.println("packed="+sapfor.getOutputMessage());
+        System.out.println("packed=" + sapfor.getOutputMessage());
         for (DBProjectFile f : target.db.files.Data.values())
             if (f.isActive()) f.state = FileState.OK;
         super.unpackMessages();
@@ -67,7 +67,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
         badCount = 0;
         for (DBProjectFile f : target.db.files.Data.values()) {
             if (f.isActive()) {
-                System.out.println("file="+f.name+":"+f.state);
+                System.out.println("file=" + f.name + ":" + f.state);
                 switch (f.state) {
                     case OK:
                     case HasNotes:
@@ -105,7 +105,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
     @Override
     protected void unpack(String packed) throws Exception {
         FilesOrderJson filesOrderJson = Utils_.gson.fromJson(packed, FilesOrderJson.class);
-        for (String fileName_ :filesOrderJson.allFiles)
+        for (String fileName_ : filesOrderJson.allFiles)
             target.files_order.add(Utils_.toW(fileName_));
     }
     @Override

src/_VisualDVM/ProjectData/Files/DBProjectFile.java

@@ -257,9 +257,8 @@ public class DBProjectFile extends ProjectFile {
                 break;
         }
     }
-
+    public void AddNewMessage(Message message) throws Exception {
-    public void AddNewMessage(Message message) throws Exception{
+        switch (message.type) {
-        switch (message.type){
             case 0:
                 MessageWarning warning = new MessageWarning(name, message.line, message.value, message.group);
                 father.db.Insert(warning);
@@ -282,8 +281,6 @@ public class DBProjectFile extends ProjectFile {
                 break;
         }
     }
-
-
     public DefaultMutableTreeNode show_loop_graph_r(FileObjectWithMessages element) {
         DefaultMutableTreeNode res = new DefaultMutableTreeNode(element);
         if (element instanceof Loop) {

src/_VisualDVM/ProjectData/Messages/Message.java

@@ -26,18 +26,6 @@ public class Message extends iDBObject {
     //--
     @Description("DEFAULT ''")
     public String file = "";
-    public String getGroup_s() {
-        switch (group) {
-            case 0:
-                return "#m0000";
-            case Constants.parser_group: //сообщения от парсера.
-                return "#parser";
-            case Constants.compiler_group:
-                return "#compiler";
-            default:
-                return  "#"+group;
-        }
-    }
     //--
     public Message() {
     }
@@ -45,7 +33,7 @@ public class Message extends iDBObject {
     ) throws Exception {
         file = file_in;
         line = line_in;
-        group=group_in;
+        group = group_in;
         if ((group == Constants.parser_group) ||
                 (group == Constants.compiler_group) ||
                 (Global.mode != Mode.Normal)) {
@@ -455,4 +443,16 @@ public class Message extends iDBObject {
             }
         }
     }
+    public String getGroup_s() {
+        switch (group) {
+            case 0:
+                return "#m0000";
+            case Constants.parser_group: //сообщения от парсера.
+                return "#parser";
+            case Constants.compiler_group:
+                return "#compiler";
+            default:
+                return "#" + group;
+        }
+    }
 }

src/_VisualDVM/ProjectData/SapforData/Arrays/AlignRule.java

@@ -39,14 +39,6 @@ public class AlignRule {
             alignRuleWith.add(new AlignRuleWidthJson(dimNum, a, b));
         }
     }
-    public void Init(){
-        //--
-        alignArray_address = new BigInteger(packedAlignArrayAddress);
-        alignWith_address = new BigInteger(packedAlignWithAddress);
-        //--
-        packedAlignArrayAddress = null;
-        packedAlignWithAddress = null;
-    }
     private static Pair<String, String> convertDigitToPositive(int digit) {
         String buf = "";
         String sign = " + ";
@@ -58,6 +50,14 @@ public class AlignRule {
             buf += String.valueOf(digit);
         return new Pair<>(sign, buf);
     }
+    public void Init() {
+        //--
+        alignArray_address = new BigInteger(packedAlignArrayAddress);
+        alignWith_address = new BigInteger(packedAlignWithAddress);
+        //--
+        packedAlignArrayAddress = null;
+        packedAlignWithAddress = null;
+    }
     public ProjectArray getAlignArray() {
         return parent_region.arraysMap.get(alignArray_address);
     }
@@ -115,7 +115,7 @@ public class AlignRule {
         retVal += getAlignArray().TypeString() + " ";
         arrayString += getAlignArray().shortName + "(";
         for (int i = 0; i < alignRule.size(); ++i) {
-            arrayString += genStringExpr(ProjectArray.alignNames[i], alignRule.get(i).getKey(),alignRule.get(i).getValue() );
+            arrayString += genStringExpr(ProjectArray.alignNames[i], alignRule.get(i).getKey(), alignRule.get(i).getValue());
             if (i != alignRule.size() - 1)
                 arrayString += ",";
         }
@@ -142,7 +142,7 @@ public class AlignRule {
         for (int i = 0; i < alignRuleWith.size(); ++i) {
             if (alignRuleWith.get(i).getDimNum() != -1) {
                 alignEachDim.set(alignRuleWith.get(i).getDimNum(),
-                        genStringExpr(ProjectArray.alignNames[i], alignRuleWith.get(i).getA(),alignRuleWith.get(i).getB() ));
+                        genStringExpr(ProjectArray.alignNames[i], alignRuleWith.get(i).getA(), alignRuleWith.get(i).getB()));
                 //коэццициенты находятся здесь!!------------------------------------------------------------------->>
                 getAlignArray().ac_current.put(i,
                         new Dimension(i,

src/_VisualDVM/ProjectData/SapforData/Arrays/AlignRuleWidthJson.java

@@ -7,22 +7,21 @@ public class AlignRuleWidthJson {
     public int a;
     @Expose
     public int b;
-    //dim -> a * dim_t + b
+    public AlignRuleWidthJson() {
-    public int getDimNum(){
-        return dimNum;
     }
-    public int getA(){
+    public AlignRuleWidthJson(int i_in, int a_in, int b_in) {
-        return a;
-    }
-    public int getB(){
-        return b;
-    }
-    public AlignRuleWidthJson(){
-
-    }
-    public AlignRuleWidthJson(int i_in, int a_in, int b_in){
         dimNum = i_in;
         a = a_in;
         b = b_in;
     }
+    //dim -> a * dim_t + b
+    public int getDimNum() {
+        return dimNum;
+    }
+    public int getA() {
+        return a;
+    }
+    public int getB() {
+        return b;
+    }
 }

src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysJson.java

@@ -5,5 +5,5 @@ import java.util.List;
 import java.util.Vector;
 public class ArraysJson {
     @Expose
-    public List<ProjectArray> allArrays=new Vector<>();
+    public List<ProjectArray> allArrays = new Vector<>();
 }

src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java

@@ -1,15 +1,12 @@
 package _VisualDVM.ProjectData.SapforData.Arrays;
 import Common.Database.Objects.DBObject;
-import Common.Utils.Index;
 import Common.Utils.IntegerPairJson;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.DBArray.DBArray;
-import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimensionState;
-import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateLink;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
 import _VisualDVM.ProjectData.SapforData.Regions.UI.ArrayAlignmentBar;
 import com.google.gson.annotations.Expose;
@@ -21,6 +18,9 @@ import java.util.List;
 import java.util.Vector;
 import java.util.stream.Collectors;
 public class ProjectArray extends DBObject {
+    //--
+    //----------------------------------------------------------------------
+    public static final String[] alignNames = {"i", "j", "k", "l", "m", "n", "q", "r", "s", "t", "u", "w", "x", "y", "z"};
     @Expose
     public long id;
     @Expose
@@ -34,10 +34,6 @@ public class ProjectArray extends DBObject {
     @Expose
     public int typeSize;
     @Expose
-    int state;
-    @Expose
-    int location;
-    @Expose
     public String locName;
     @Expose
     public int isTemplFlag;
@@ -45,17 +41,6 @@ public class ProjectArray extends DBObject {
     public int isLoopArrayFlag;
     @Expose
     public Vector<ArrayDecl> declPlaces = new Vector<>();
-    @Expose
-    List<Integer> deprecateToDist = new Vector<>();
-    @Expose
-    List<Integer> mappedDims = new Vector<>();
-    @Expose
-    Vector<IntegerPairJson> sizes = new Vector<>();
-    @Expose
-    Vector<String> regions = new Vector<>();
-    //--
-    //----------------------------------------------------------------------
-    public static final String[] alignNames = {"i", "j", "k", "l", "m", "n", "q", "r", "s", "t", "u", "w", "x", "y", "z"};
     public String UniqKey;
     public BigInteger address;
     //только для шаблонов. для ФИЛЬТРА управления распределением измерений.
@@ -73,6 +58,33 @@ public class ProjectArray extends DBObject {
     public LinkedHashMap<Integer, Dimension> ac_new;
     //https://stackoverflow.com/questions/4941372/how-to-insert-image-into-jtable-cell
     public ArrayAlignmentBar bar = null;
+    @Expose
+    int state;
+    @Expose
+    int location;
+    @Expose
+    List<Integer> deprecateToDist = new Vector<>();
+    @Expose
+    List<Integer> mappedDims = new Vector<>();
+    @Expose
+    Vector<IntegerPairJson> sizes = new Vector<>();
+    @Expose
+    Vector<String> regions = new Vector<>();
+    public static String fill_binary(int d, String binary) {
+        int delta = Math.abs(binary.length() - d);
+        String res = binary;
+        for (int i = 0; i < delta; ++i) {
+            res = ("0" + res);
+        }
+        return res;
+    }
+    //длина должна быть равной, ищем есть ли совпадающие позиции с единицами
+    public static boolean mask(String banned, String variant) {
+        for (int i = 0; i < variant.length(); ++i)
+            if ((variant.toCharArray()[i] == '1') && (banned.toCharArray()[i] == '1')) //попался, масконосец!
+                return true;
+        return false;
+    }
     //------
     public void print() {
         Vector<String> res = new Vector<>();
@@ -119,21 +131,6 @@ public class ProjectArray extends DBObject {
         ac_new = new LinkedHashMap<>();
         //--FileForm
     }
-    public static String fill_binary(int d, String binary) {
-        int delta = Math.abs(binary.length() - d);
-        String res = binary;
-        for (int i = 0; i < delta; ++i) {
-            res = ("0" + res);
-        }
-        return res;
-    }
-    //длина должна быть равной, ищем есть ли совпадающие позиции с единицами
-    public static boolean mask(String banned, String variant) {
-        for (int i = 0; i < variant.length(); ++i)
-            if ((variant.toCharArray()[i] == '1') && (banned.toCharArray()[i] == '1')) //попался, масконосец!
-                return true;
-        return false;
-    }
     public String printLinks() {
         Vector<String> res = links.keySet().stream().map(Object::toString).collect(Collectors.toCollection(Vector::new));
         return String.join(" ", res);

src/_VisualDVM/ProjectData/SapforData/GCOV/GCOVJson.java

@@ -5,5 +5,5 @@ import java.util.List;
 import java.util.Vector;
 public class GCOVJson {
     @Expose
-    public List<FileGCOVJson> allGCov= new Vector<>();
+    public List<FileGCOVJson> allGCov = new Vector<>();
 }

src/_VisualDVM/ProjectData/SapforData/Includes/Analysis/FileInfo.java

@@ -1,7 +1,6 @@
 package _VisualDVM.ProjectData.SapforData.Includes.Analysis;
 import Common.Utils.Utils_;
 import _VisualDVM.ProjectData.SapforData.FileObject;
-import _VisualDVM.ProjectData.SapforData.Includes.Analysis.Include;
 import com.google.gson.annotations.Expose;
 
 import javax.swing.*;

src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java

@@ -1,10 +1,7 @@
 package _VisualDVM.ProjectData.SapforData.Regions;
 import Common.Database.Objects.DBObject;
-import Common.Utils.Index;
 import Common.Utils.IntegerPairJson;
 import Common.Utils.Pair;
-import Common.Utils.Utils_;
-import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.Arrays.AlignRule;
@@ -30,6 +27,21 @@ public class ParallelRegion extends DBObject {
     public Vector<AlignRule> alignRules;
     //----
     public Vector<String> rules;
+    //--
+    public BigInteger regionId;
+    //name in program
+    // file -> <start, end> lines
+    public LinkedHashMap<String, List<IntegerPairJson>> lines; //+
+    //ключ - адрес. меняем
+    public LinkedHashMap<BigInteger, ProjectArray> arraysMap; //+
+    //for directive creating
+    public int maxdim = 0;
+    public Vector<String> fragments; //+
+    public int lines_count = 0;
+    public int loops_count = 0;
+    public int arrays_count = 0;
+    public int fd_count = 0;
+    public int fc_count = 0;
     public void genRules(LinkedHashMap<BigInteger, ProjectArray> Arrays) {
         rules.clear();
         int maxLen = 0;
@@ -48,26 +60,11 @@ public class ParallelRegion extends DBObject {
             for (String r : v)
                 rules.add(r);
     }
-    //--
-    public BigInteger regionId;
-    //name in program
-    // file -> <start, end> lines
-    public LinkedHashMap<String, List<IntegerPairJson>> lines; //+
-    //ключ - адрес. меняем
-    public LinkedHashMap<BigInteger, ProjectArray> arraysMap; //+
-    //for directive creating
-    public int maxdim = 0;
-    public Vector<String> fragments; //+
-    public int lines_count = 0;
-    public int loops_count = 0;
-    public int arrays_count = 0;
-    public int fd_count = 0;
-    public int fc_count = 0;
     public void Init() {
         arraysMap = new LinkedHashMap<>();
         lines = new LinkedHashMap<>();
         fragments = new Vector<>();
-        rules=new Vector<>();
+        rules = new Vector<>();
         //--
         if (packedRegionId != null)
             regionId = new BigInteger(packedRegionId);
@@ -75,14 +72,14 @@ public class ParallelRegion extends DBObject {
         for (ProjectArray array : packedArrays) {
             array.Init();//имена и адреса.
             arraysMap.put(array.address, array);
-            if (array.isTemplFlag==1){
+            if (array.isTemplFlag == 1) {
                 maxdim = Math.max(maxdim, array.dimSize);
                 Global.mainModule.getProject().templates.add(array);
                 array.regIDs.add(regionId);
             } else if (array.isLoopArrayFlag != 1) arrays_count++;
         }
         //---
-        for (AlignRule rule: alignRules) {
+        for (AlignRule rule : alignRules) {
             rule.Init();
             rule.parent_region = this;
         }

src/_VisualDVM/TestingSystem/Common/TestsDatabase.java

@@ -673,7 +673,7 @@ public class TestsDatabase extends SQLiteDatabase {
         Vector<DVMCompilationOptionsSet> optionsSets = getVectorByFK(dvmSettings_in, DVMCompilationOptionsSet.class);
         Vector<DVMEnvironmentsSet> environmentsSets = getVectorByFK(dvmSettings_in, DVMEnvironmentsSet.class);
         //----
-        if (optionsSets.isEmpty() && environmentsSets.isEmpty()){
+        if (optionsSets.isEmpty() && environmentsSets.isEmpty()) {
             return res;
         }
         int size_ = Math.min(optionsSets.size(), environmentsSets.size());
@@ -687,14 +687,14 @@ public class TestsDatabase extends SQLiteDatabase {
                     environmentsLine));
         }
         //дополнения
-        if (optionsSets.size()<environmentsSets.size()){
+        if (optionsSets.size() < environmentsSets.size()) {
             for (int i = optionsSets.size(); i < environmentsSets.size(); ++i) {
                 res.add(new Pair<>(
                         "",
                         printEnvironmentsLine(getVectorByFK(environmentsSets.get(i), DVMEnvironment.class))
                 ));
             }
-        }else {
+        } else {
             if (optionsSets.size() > environmentsSets.size()) {
                 for (int i = environmentsSets.size(); i < optionsSets.size(); ++i) {
                     res.add(new Pair<>(

src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java

@@ -1,5 +1,4 @@
 package _VisualDVM.TestingSystem.SAPFOR.Json;
-import Common.CommonConstants;
 import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
 import _VisualDVM.Constants;
@@ -7,13 +6,11 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.FileType;
 import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
-import _VisualDVM.ProjectData.Messages.Errors.MessageError;
 import _VisualDVM.ProjectData.Messages.FileMessagesJson;
 import _VisualDVM.ProjectData.Messages.Message;
 import _VisualDVM.ProjectData.Messages.MessagesJson;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
-import _VisualDVM.Utils;
 import com.google.gson.annotations.Expose;
 import org.apache.commons.io.FileUtils;
 
@@ -23,8 +20,6 @@ import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.util.LinkedHashMap;
 import java.util.Vector;
-
-import static java.lang.Character.isDigit;
 public class SapforVersion_json implements Serializable {
     @Expose
     public String version = "";
@@ -127,40 +122,6 @@ public class SapforVersion_json implements Serializable {
             }
         }
     }
-    public boolean isMatch(SapforVersion_json version_json) {
-        if (!description.equals(version_json.description)) {
-            return false;
-        }
-        if (files.size() != version_json.files.size()) {
-            return false;
-        }
-        for (String name1 : files.keySet()) {
-            if (!version_json.files.containsKey(name1)) {
-                return false;
-            }
-        }
-        for (String name1 : files.keySet()) {
-            ProjectFile file1 = files.get(name1);
-            ProjectFile file2 = version_json.files.get(name1);
-            //---
-            String text1 = "";
-            String text2 = "";
-            try {
-                text1 = FileUtils.readFileToString(file1.file, Charset.defaultCharset());
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-            try {
-                text2 = FileUtils.readFileToString(file2.file, Charset.defaultCharset());
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-            if (!Utils.compareFortranTexts(text1, text2)) {
-                return false;
-            }
-        }
-        return true;
-    }
     public boolean isMatchServer(SapforVersion_json version_json) {
         if (!description.equals(version_json.description)) {
             return false;
@@ -229,26 +190,25 @@ public class SapforVersion_json implements Serializable {
             if (err.exists())
                 project.Log += "\n" + FileUtils.readFileToString(err);
             //--
-            if (messages_dump.exists()){
+            if (messages_dump.exists()) {
                 try {
                     String packed = FileUtils.readFileToString(messages_dump);
                     messagesJson = Utils_.gson.fromJson(packed, MessagesJson.class);
-                }
+                } catch (Exception ex) {
-                catch (Exception ex){
                     ex.printStackTrace();
                 }
             }
             project.Open();
             project.Update(); //Журнал
             //а так же, убрать dep и txt
-            if (messagesJson!=null){
+            if (messagesJson != null) {
                 project.db.BeginTransaction();
                 //-
-                for (FileMessagesJson fileMessagesJson: messagesJson.allMessages){
+                for (FileMessagesJson fileMessagesJson : messagesJson.allMessages) {
                     fileMessagesJson.file = Utils_.toW(fileMessagesJson.file);
                     //--
                     DBProjectFile file = project.db.files.Data.get(fileMessagesJson.file);
-                    for (Message message: fileMessagesJson.messages) {
+                    for (Message message : fileMessagesJson.messages) {
                         file.CreateAndAddNewMessage(1, message.value, message.line, message.group);
                     }
                     //update file

src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java

@@ -155,7 +155,7 @@ public class SapforTask extends DBObject {
                 SapforVersion_json version1 = versions1.get(name1);
                 SapforVersion_json version2 = versions2.get(name1);
                 //---
-                if (!version1.isMatch(version2)) {
+                if (!version1.isMatchServer(version2)) {
                     comparisonState = ComparisonState.NotMatch;
                     task2.comparisonState = ComparisonState.NotMatch;
                     version1.comparisonState = VersionComparisonState.NotMatch;

src/_VisualDVM/Utils.java

@@ -597,6 +597,7 @@ public class Utils {
             ex.printStackTrace();
         }
     }
+    /*
     public static Pair<Vector<String>, Vector<String>> getFortranLines(String text) {
         Vector<String> lines = new Vector<>();
         Vector<String> visible_lines = new Vector<>();
@@ -674,6 +675,8 @@ public class Utils {
         }
         return new Pair<>(lines, visible_lines);
     }
+     */
+    /*
     public static boolean CompareLines(String line1_raw, String line2_raw) {
         String line1 = line1_raw;
         String line2 = line2_raw;
@@ -693,19 +696,7 @@ public class Utils {
             if (CompareLines(list.get(i), line)) last_index = i;
         return (last_index >= max_index);
     }
-    public static boolean compareFortranTexts(String text1, String text2) {
+     */
-        Pair<Vector<String>, Vector<String>> p1 = getFortranLines(text1);
-        Pair<Vector<String>, Vector<String>> p2 = getFortranLines(text2);
-        Vector<String> lines1 = p1.getKey();
-        Vector<String> lines2 = p2.getKey();
-        if (lines1.size() != lines2.size())
-            return false;
-        for (int i = 0; i < lines1.size(); ++i) {
-            if (!CompareLines(lines1.get(i), lines2.get(i)))
-                return false;
-        }
-        return true;
-    }
     //--
     private static void get_newest_file_date_r(File dir, Vector<Long> dates) {
         Vector<File> files = new Vector(Arrays.asList(dir.listFiles(new FileFilter() {

src/_VisualDVM/Visual/Windows/ComparisonForm.java

@@ -18,6 +18,7 @@ import javax.swing.*;
 import javax.swing.text.Highlighter;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Vector;
 public abstract class ComparisonForm<T> {
@@ -25,7 +26,6 @@ public abstract class ComparisonForm<T> {
     final char cseparator = '\u200B';
     public Class<T> t; //класс объектов.
     //-->>
-    public Vector<String> lines = new Vector<>(); //строки с учетом/неучетом пробелов. для сравнения
     public Vector<String> visible_lines = new Vector<>(); //строки с нетронутыми пробелами. для отображения
     protected JToolBar tools;
     protected JLabel lObjectName;
@@ -159,12 +159,8 @@ public abstract class ComparisonForm<T> {
         showObject();
     }
     private void getLines() {
-        lines.clear();
         visible_lines.clear();
-        //--
+        visible_lines = new Vector<String>(Arrays.asList(getText().split("\n")));
-        Pair<Vector<String>, Vector<String>> p = Utils.getFortranLines(getText());
-        lines = p.getKey();
-        visible_lines = p.getValue();
     }
     protected void ClearText() {
         events_on = false;
@@ -189,7 +185,7 @@ public abstract class ComparisonForm<T> {
         DiffRowGenerator generator = DiffRowGenerator.create()
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
-                .ignoreWhiteSpaces(true)
+                //    .ignoreWhiteSpaces(false)
                 .oldTag(f -> separator)
                 .newTag(f -> separator)
                 .build();
@@ -274,9 +270,9 @@ public abstract class ComparisonForm<T> {
         t2.addAll(slave.visible_lines);
         //просто выясняем кто из них длиннее, и короткий дополняем пустыми строками.]
         int delta = Math.abs(t1.size() - t2.size());
-        if (lines.size() > slave.lines.size()) {
+        if (visible_lines.size() > slave.visible_lines.size()) {
             Utils.addEmptyLines(t2, delta);
-        } else if (lines.size() < slave.lines.size()) {
+        } else if (visible_lines.size() < slave.visible_lines.size()) {
             Utils.addEmptyLines(t1, delta);
         }
         ///----------------

src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java

@@ -247,7 +247,7 @@ public class SapforPackagesComparisonForm {
                         package1.package_json.tasks.parallelStream()
                                 .forEach(task1 -> {
                                     SapforTask task2 = package2.package_json.getTaskByKey(task1.getUniqueKey());
-                                    task1.checkMatch(task2);
+                                    task1.checkMatchServer(task2);
                                 })
                 ).join();
                 System.out.println("done");