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
2024-10-14 12:54:52 +03:00
parent e1627badd3
commit e64a4f4c47
45 changed files with 211 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/_VisualDVM/Passes/All/BuildComponent.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Passes.PassCode;
import Common.Passes.PassException;
@@ -24,7 +24,7 @@ public class BuildComponent extends ProcessPass<Component> {
}
@Override
protected void performPreparation() throws Exception {
Utils.forceDeleteWithCheck(target.getAssemblyFile());
Utils_.forceDeleteWithCheck(target.getAssemblyFile());
}
@Override
protected void body() throws Exception {

3
src/_VisualDVM/Passes/All/Compile.java
View File

@@ -3,7 +3,6 @@ import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.GlobalData.User.UserState;
@@ -54,7 +53,7 @@ public class Compile extends Pass<db_project_info> {
compilationTask.CompleteSummary(target.compilation_maxtime);
compilationTask.state = TaskState.Inactive;
Global.mainModule.getDb().Insert(compilationTask);
Utils.forceDeleteWithCheck(compilationTask.getLocalWorkspace());
Utils_.forceDeleteWithCheck(compilationTask.getLocalWorkspace());
}
@Override
protected void showPreparation() throws Exception {

4
src/_VisualDVM/Passes/All/DeleteDebugResults.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.Passes.Project.CurrentProjectPass;
@@ -17,7 +17,7 @@ public class DeleteDebugResults extends CurrentProjectPass {
Vector<Task> toDelete = Global.mainModule.getDb().compilationTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).collect(Collectors.toCollection(Vector::new));
Global.mainModule.getDb().runTasks.Data.values().stream().filter(task -> task.belongsToProject(target)).forEach(toDelete::add);
for (Task task : toDelete) {
Utils.forceDeleteWithCheck(task.getLocalWorkspace());
Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
Global.mainModule.getDb().Delete(task);
}
}

4
src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.FileObject.DirInfo;
import _VisualDVM.GlobalData.FileObject.DirInfosDataSet;
import _VisualDVM.GlobalData.FileObject.DirInfosFields;
@@ -62,7 +62,7 @@ public class DeleteDownloadedBugReports extends Pass<DirInfosDataSet> {
protected void body() throws Exception {
for (DirInfo dir : target.Data.values()) {
ShowMessage1(dir.getPK().toString());
Utils.forceDeleteWithCheck(dir.getFile());
Utils_.forceDeleteWithCheck(dir.getFile());
}
}
}

3
src/_VisualDVM/Passes/All/DeleteFile.java
View File

@@ -4,7 +4,6 @@ import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.Passes.PassCode;
@@ -29,7 +28,7 @@ public class DeleteFile extends ChangeFilePass<DBProjectFile> {
protected void body() throws Exception {
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(target.node);
project.db.Delete(target);
Utils.forceDeleteWithCheck(target.file);
Utils_.forceDeleteWithCheck(target.file);
}
@Override
protected void performDone() throws Exception {

6
src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import Common.Passes.Pass;
@@ -33,10 +33,10 @@ public class DeleteSelectedCompilationTasks extends Pass<Vector<CompilationTask>
for (CompilationTask task : target) {
for (RunTask runTask : task.getRunTasks().values()) {
Global.mainModule.getDb().Delete(runTask);
Utils.forceDeleteWithCheck(runTask.getLocalWorkspace());
Utils_.forceDeleteWithCheck(runTask.getLocalWorkspace());
}
Global.mainModule.getDb().Delete(task);
Utils.forceDeleteWithCheck(task.getLocalWorkspace());
Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
}
}
@Override

4
src/_VisualDVM/Passes/All/DeleteSelectedFiles.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
@@ -49,7 +49,7 @@ public class DeleteSelectedFiles extends Pass {
ShowMessage1(file.name);
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(file.node);
Global.mainModule.getProject().db.Delete(file);
Utils.forceDeleteWithCheck(file.file);
Utils_.forceDeleteWithCheck(file.file);
}
}
}

4
src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import Common.Passes.Pass;
@@ -31,7 +31,7 @@ public class DeleteSelectedRunTasks extends Pass<Vector<RunTask>> {
protected void body() throws Exception {
for (RunTask task : target) {
Global.mainModule.getDb().Delete(task);
Utils.forceDeleteWithCheck(task.getLocalWorkspace());
Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
}
}
@Override

3
src/_VisualDVM/Passes/All/DeleteVersion.java
View File

@@ -4,7 +4,6 @@ import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
@@ -46,7 +45,7 @@ public class DeleteVersion extends Pass<db_project_info> {
}
@Override
protected void body() throws Exception {
Utils.forceDeleteWithCheck(target.Home);
Utils_.forceDeleteWithCheck(target.Home);
}
@Override
protected void performDone() throws Exception {

3
src/_VisualDVM/Passes/All/DownloadBugReport.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.Server.ServerCode;
@@ -17,7 +16,7 @@ public class DownloadBugReport extends ComponentsRepositoryPass<BugReport> {
}
@Override
protected void performPreparation() throws Exception {
Utils.CheckDirectory(Global.BugReportsDirectory);
Utils_.CheckDirectory(Global.BugReportsDirectory);
}
@Override
protected void ServerAction() throws Exception {

3
src/_VisualDVM/Passes/All/DownloadDVMPackages.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
@@ -61,7 +60,7 @@ public class DownloadDVMPackages extends Pass<Vector<Integer>> {
DVMPackage dvmPackage = Global.testingServer.db.dvmPackages.get(p.getKey());
ShowMessage2(String.valueOf(dvmPackage.id));
File workspace = dvmPackage.getLocalWorkspace();
Utils.CheckAndCleanDirectory(workspace);
Utils_.CheckAndCleanDirectory(workspace);
File results_zip = new File(workspace, "results.zip");
File results = new File(workspace, "results");
File loaded = new File(workspace, Constants.LOADED);

2
src/_VisualDVM/Passes/All/DownloadSapforPackage.java
View File

@@ -48,7 +48,7 @@ public class DownloadSapforPackage extends Pass<SapforPackage> {
@Override
protected void body() throws Exception {
File workspace = target.getLocalWorkspace();
Utils.forceDeleteWithCheck(workspace);
Utils_.forceDeleteWithCheck(workspace);
File archive = Utils.getTempFileName(String.valueOf(target.id));
Utils_.bytesToFile(packed,archive);
Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(archive.getAbsolutePath(), Global.SapforPackagesDirectory.getAbsolutePath());

5
src/_VisualDVM/Passes/All/DownloadTest.java
View File

@@ -3,7 +3,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -30,8 +29,8 @@ public class DownloadTest extends TestingSystemPass<Test> {
protected void performPreparation() throws Exception {
Global.mainModule.getPass(PassCode.CloseCurrentProject).Do();
Global.mainModule.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Utils.forceDeleteWithCheck(target.getArchive());
Utils.forceDeleteWithCheck(target.getHomePath());
Utils_.forceDeleteWithCheck(target.getArchive());
Utils_.forceDeleteWithCheck(target.getHomePath());
}
@Override
protected void ServerAction() throws Exception {

3
src/_VisualDVM/Passes/All/GCOV.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.LanguageName;
@@ -79,7 +78,7 @@ public class GCOV extends Precompilation {
String uname = file.last_assembly_name.substring(0, file.last_assembly_name.length() - 2);
String gcno = uname + ".gcno";
File gcov = Paths.get(workspace.getAbsolutePath(), file.file.getName() + ".gcov").toFile();
Utils.forceDeleteWithCheck(gcov);
Utils_.forceDeleteWithCheck(gcov);
name_to_kill = "gcov.exe";
StartProcess("gcov -b " +
Utils_.DQuotes(

2
src/_VisualDVM/Passes/All/LocalInitaliseUser.java
View File

@@ -18,7 +18,7 @@ public class LocalInitaliseUser extends ProcessPass<User> {
protected void body() throws Exception {
File workspace = new File(Utils_.getHomeDirectory(), "User");
target.workspace = workspace.getAbsolutePath();
Utils.CheckAndCleanDirectory(workspace);
Utils_.CheckAndCleanDirectory(workspace);
FileUtils.forceMkdir(target.getLocalProjectsDir());
FileUtils.forceMkdir(target.getLocalModulesDir());
//-

5
src/_VisualDVM/Passes/All/Run.java
View File

@@ -3,7 +3,6 @@ import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -29,7 +28,7 @@ public class Run extends Pass<db_project_info> {
runTasks = Global.mainModule.getRunConfiguration().generateRunTasks(target, Global.mainModule.getCompilationTask());
for (RunTask runTask : runTasks) {
Global.mainModule.getDb().Insert(runTask);
Utils.forceDeleteWithCheck(runTask.getLocalWorkspace());
Utils_.forceDeleteWithCheck(runTask.getLocalWorkspace());
}
}
@Override
@@ -93,7 +92,7 @@ public class Run extends Pass<db_project_info> {
case DoneWithErrors:
task_completed = true;
if (task.hasDvmSts) {
Utils.CheckAndCleanDirectory(Global.mainModule.getProject().getStatisticDirectory());
Utils_.CheckAndCleanDirectory(Global.mainModule.getProject().getStatisticDirectory());
Global.mainModule.getPass(PassCode.SPF_StatisticAnalyzer).Do(task);
}
break;

3
src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
View File

@@ -3,7 +3,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
@@ -196,6 +195,6 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
@Override
protected void performFail() throws Exception {
super.performFail();
Utils.forceDeleteWithCheck(target.getProjFile());
Utils_.forceDeleteWithCheck(target.getProjFile());
}
}

3
src/_VisualDVM/Passes/All/SynchronizeBugReports.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
@@ -38,7 +39,7 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
protected void performDone() throws Exception {
super.performDone();
server.db.Disconnect();
Utils.forceDeleteWithCheck(server.db.getFile());
Utils_.forceDeleteWithCheck(server.db.getFile());
FileUtils.moveFile(new_db_file, server.db.getFile());
server.db.Connect();
server.db.prepareTablesStatements();

3
src/_VisualDVM/Passes/All/SynchronizeTests.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Visual.Controls.PassButton;
import _VisualDVM.Visual.UI;
@@ -52,7 +53,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
protected void performDone() throws Exception {
super.performDone();
server.db.Disconnect();
Utils.forceDeleteWithCheck(server.db.getFile());
Utils_.forceDeleteWithCheck(server.db.getFile());
FileUtils.moveFile(new_db_file, server.db.getFile());
server.db.Connect();
server.db.prepareTablesStatements();

4
src/_VisualDVM/Passes/All/UnzipFolderPass.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Utils;
import Common.Utils.Utils_;
import Common.Passes.Pass;
import java.io.File;
@@ -27,7 +27,7 @@ public class UnzipFolderPass<T> extends Pass<T> {
@Override
protected void performPreparation() throws Exception {
if (clean_dst)
Utils.forceDeleteWithCheck(new File(dst));
Utils_.forceDeleteWithCheck(new File(dst));
}
@Override
protected void body() throws Exception {