no message
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
package Visual_DVM_2021.Passes.All;
|
||||
import Common.Utils.CommonUtils;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
|
||||
import Common_old.Utils.Utils;
|
||||
@@ -46,7 +47,7 @@ public class CombineFiles extends Transformation {
|
||||
@Override
|
||||
protected void body() throws Exception {
|
||||
result = Paths.get(target.last_version.Home.getAbsolutePath(),
|
||||
Global.isWindows ? fd.Result : Utils.toU(fd.Result)).toFile();
|
||||
Global.isWindows ? fd.Result : CommonUtils.toU(fd.Result)).toFile();
|
||||
//-----------------------
|
||||
//получить список хедеров.
|
||||
//-----------------------
|
||||
@@ -55,13 +56,13 @@ public class CombineFiles extends Transformation {
|
||||
//-----------------------------
|
||||
result_lines.add("!-Found " + target.allIncludes.size() + " headers");
|
||||
for (String name : target.allIncludes.keySet()) {
|
||||
all_includes.add(" include " + Utils.Quotes(Utils.toU(name)));
|
||||
result_lines.add("! include " + Utils.Quotes(Utils.toU(name)));
|
||||
all_includes.add(" include " + CommonUtils.Quotes(CommonUtils.toU(name)));
|
||||
result_lines.add("! include " + CommonUtils.Quotes(CommonUtils.toU(name)));
|
||||
}
|
||||
result_lines.add("!-Collapse-" + target.files_order.size() + " files");
|
||||
int i = 1;
|
||||
for (String name : target.files_order) {
|
||||
result_lines.add("! -- " + i + ". " + Utils.Brackets(name));
|
||||
result_lines.add("! -- " + i + ". " + CommonUtils.Brackets(name));
|
||||
++i;
|
||||
}
|
||||
result_lines.add("!--------------------");
|
||||
@@ -75,8 +76,8 @@ public class CombineFiles extends Transformation {
|
||||
String header = Utils.extractHeaderName(line);
|
||||
if (header != null) {
|
||||
if (file.relativeHeaders.containsKey(header))
|
||||
result_lines.add(" include " + Utils.Quotes(
|
||||
Utils.toU(
|
||||
result_lines.add(" include " + CommonUtils.Quotes(
|
||||
CommonUtils.toU(
|
||||
file.relativeHeaders.get(header).name)));
|
||||
} else
|
||||
result_lines.add(line);
|
||||
|
||||
Reference in New Issue
Block a user