M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

++

Browse Source 
fix бага со слиянием
This commit is contained in:
02090095
2025-05-13 15:33:47 +03:00
parent 0ec1ce09da
commit 0cb4022969
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/_VisualDVM/Passes/All/CombineFiles.java
View File

@@ -1,5 +1,6 @@
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;
@@ -54,9 +55,11 @@ 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");
for (String name : target.allIncludes) {
all_includes.add(" include " + Utils_.Quotes(Utils_.toU(name)));
all_includes.add(" include " + Utils_.Quotes(Utils_.toU(name))); //---
result_lines.add("! include " + Utils_.Quotes(Utils_.toU(name)));
}
result_lines.add("!-Collapse-" + target.files_order.size() + " files");
@@ -76,8 +79,7 @@ public class CombineFiles extends Transformation {
String header = Utils.extractHeaderName(line);
if (header != null) {
if (file.dependencies.contains(header))
result_lines.add(" include " + Utils_.Quotes(
Utils_.toU(header)));
result_lines.add(" include " + Utils_.Quotes(Utils_.toU(header)));
} else
result_lines.add(line);
}
@@ -86,6 +88,7 @@ public class CombineFiles extends Transformation {
result_lines.addAll(FileUtils.readLines(target.db.files.Data.get(name).file));
}
}
FileUtils.writeLines(result, result_lines, false);
//-------------------------------
//теперь скопировать остальные файлы