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

no message

Browse Source
This commit is contained in:
02090095
2023-11-26 16:11:17 +03:00
parent 253de8526a
commit 269615abcb
15 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ProjectData/Project/db_project_info.java
View File

@@ -1014,7 +1014,7 @@ public class db_project_info extends DBObject {
}
return null;
}
public void migrateFilesSettings(db_project_info target, boolean migrate_arrays, boolean migrate_headers, boolean sapforStyle) throws Exception {
public void migrateFilesSettings(db_project_info target, boolean migrate_arrays, boolean sapforStyle) throws Exception {
Pair<LinkedHashMap<String, DBProjectFile>, LinkedHashMap<String, DBProjectFile>> sortedFiles = sortFiles();
//--
LinkedHashMap<String, DBProjectFile> programs = sortedFiles.getKey();
@@ -1040,16 +1040,13 @@ public class db_project_info extends DBObject {
version_file.importSettings(file, sapforStyle);
target.db.Update(version_file);
} else {
if (//!file.state.equals(FileState.Excluded)&&
(!file.fileType.equals(FileType.header) || migrate_headers)) {
File toCopy = Paths.get(target.Home.getAbsolutePath(), file.name).toFile();
if (!toCopy.exists())
Files.copy(file.file.toPath(), toCopy.toPath());
//--
DBProjectFile new_version_file = new DBProjectFile(toCopy, target);
new_version_file.importSettings(file, sapforStyle);
target.db.Insert(new_version_file);
}
File toCopy = Paths.get(target.Home.getAbsolutePath(), file.name).toFile();
if (!toCopy.exists())
Files.copy(file.file.toPath(), toCopy.toPath());
//--
DBProjectFile new_version_file = new DBProjectFile(toCopy, target);
new_version_file.importSettings(file, sapforStyle);
target.db.Insert(new_version_file);
}
}
//---
@@ -1098,7 +1095,7 @@ public class db_project_info extends DBObject {
//теперь копируем инфу по файлам.
if (cloneData) {
db_project_info res = new db_project_info(dst);
migrateFilesSettings(res, false, true, false);
migrateFilesSettings(res, true, false);
}
}
public void Clone(File dst) throws Exception {