no message
This commit is contained in:
@@ -1,18 +1,18 @@
|
||||
package _VisualDVM.Passes.All;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Visual.Controls.PassMenuItem;
|
||||
import Common.Visual.UI_;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Visual.Menus.PassMenuItem;
|
||||
import _VisualDVM.Visual.UI;
|
||||
import _VisualDVM.Utils;
|
||||
import _VisualDVM.GlobalData.Settings.SettingName;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
|
||||
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
||||
import _VisualDVM.ProjectData.Project.db_project_info;
|
||||
import _VisualDVM.Repository.Server.ServerCode;
|
||||
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
|
||||
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.Utils;
|
||||
import _VisualDVM.Visual.UI;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -60,7 +60,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
|
||||
FileUtils.forceMkdir(cleanCopy);
|
||||
archive = Paths.get(workspace.getAbsolutePath(), target.name + ".zip").toFile();
|
||||
target.Clone(cleanCopy, false);
|
||||
if (! Global.mainModule.getPass(PassCode.ZipFolderPass).Do(cleanCopy.getAbsolutePath(), archive.getAbsolutePath())) {
|
||||
if (!Global.mainModule.getPass(PassCode.ZipFolderPass).Do(cleanCopy.getAbsolutePath(), archive.getAbsolutePath())) {
|
||||
Log.Writeln_("Не удалось создать архив проекта!");
|
||||
return false;
|
||||
}
|
||||
@@ -106,7 +106,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
|
||||
versionArchive = new File(workspace, target.name + "_result.zip");
|
||||
response.Unpack(versionArchive);
|
||||
File result = new File(workspace, "result");
|
||||
if ( Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(versionArchive.getAbsolutePath(), result.getAbsolutePath())) {
|
||||
if (Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(versionArchive.getAbsolutePath(), result.getAbsolutePath())) {
|
||||
if (target.last_modification == null) {
|
||||
target.last_modification = new db_project_info(target,
|
||||
"m",
|
||||
@@ -145,7 +145,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
|
||||
@Override
|
||||
protected void performDone() throws Exception {
|
||||
target.joinExistingVersion(version, getDescription());
|
||||
target.migrateFilesSettings(target.last_version, false, false);
|
||||
target.migrateFilesSettings(target.last_version, false, false);
|
||||
}
|
||||
@Override
|
||||
public JMenuItem createMenuItem() {
|
||||
|
||||
Reference in New Issue
Block a user