++

fix бага со слиянием

src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java

@@ -1,5 +1,6 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
@@ -46,13 +47,16 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
             DBProjectFile file = target.db.files.get(fileIncludesJson.file);
             System.out.println("addicted file = "+Utils_.Brackets(fileIncludesJson.file));
             System.out.println("found dependencies :"+fileIncludesJson.includes.size());
+          ///  UI.Info("+");
             for (Include include : fileIncludesJson.includes) {
                 //--
+                System.out.println(include.dependencyFileName);
+                System.out.println(include.line);
                 include.dependencyFileName = Utils_.toW(include.dependencyFileName);
                 //--
                 fileInfo.dependencies.add(include);
-                if (!target.allIncludes.contains(include.file))
-                    target.allIncludes.add(include.file);
+                if (!target.allIncludes.contains(include.dependencyFileName))
+                    target.allIncludes.add(include.dependencyFileName);
                 if (target.db.files.containsKey(include.dependencyFileName)){
                     //- определение типов языков инклудов по файлу куда они цепляютс.
                     if (!file.dependencies.contains(include.dependencyFileName)) {
@@ -87,6 +91,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
         }
         target.numAddicted += target.addictedFiles.size();
         target.UpdateAddictedCount();
+      //  UI.Info("unpack includes done");
     }
     @Override
     protected void showDone() throws Exception {