fix.убрал из общей(в перспективе библиотечной) части ссылки на частные объекты визуализатора

This commit is contained in:
2024-10-16 00:40:45 +03:00
parent b79474fdd1
commit 071aab5ea6
54 changed files with 166 additions and 113 deletions

View File

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Global;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.Project.ChangeFilePass;

View File

@@ -2,7 +2,7 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;

View File

@@ -1,5 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Constants;
import Common.CommonConstants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
@@ -22,7 +22,7 @@ public class DownloadDVMPackage extends DownloadDVMPackages {
Log.Writeln_("Возможно скачать и отобразить задачи только завершённого пакета!");
return false;
}
if (new File(dvmPackage.getLocalWorkspace(), Constants.LOADED).exists()) {
if (new File(dvmPackage.getLocalWorkspace(), CommonConstants.LOADED).exists()) {
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowDVMPackage(dvmPackage);
Global.testingServer.db.dvmRunTasks.ShowDVMPackage(dvmPackage);
return false;

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingSystemPass;
@@ -63,7 +63,7 @@ public class DownloadDVMPackages extends Pass<Vector<Integer>> {
Utils_.CheckAndCleanDirectory(workspace);
File results_zip = new File(workspace, "results.zip");
File results = new File(workspace, "results");
File loaded = new File(workspace, Constants.LOADED);
File loaded = new File(workspace, CommonConstants.LOADED);
Pair<byte[], byte[]> packed_package = p.getValue();
//---
Utils_.bytesToFile(packed_package.getKey(), results_zip);

View File

@@ -1,4 +1,5 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.ProcessPass;
@@ -19,7 +20,7 @@ public class DownloadRepository extends ProcessPass {
return true;
}
private void synchronize(String src, File dst) throws Exception {
File loadedFile = Paths.get(dst.getAbsolutePath(), Constants.LOADED).toFile();
File loadedFile = Paths.get(dst.getAbsolutePath(), CommonConstants.LOADED).toFile();
if (loadedFile.exists()) {
PerformScript("cd " +
dst.getAbsolutePath() +

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingSystemPass;
@@ -28,7 +28,7 @@ public class DownloadSapforPackage extends Pass<SapforPackage> {
return false;
}
int id = target.id;
loaded = new File(target.getLocalWorkspace(), Constants.LOADED);
loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED);
if (!loaded.exists()) {
Pass pass = new TestingSystemPass() {
@Override

View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Passes.Pass;
import Common.Utils.Index;
import Common.Utils.Utils_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -71,7 +71,7 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
if (!dvmPackage.state.isDone()) {
Log.Writeln_("Пакет " + dvmPackage.id + " не завершен.");
} else {
if (!new File(dvmPackage.getLocalWorkspace(), Constants.LOADED).exists()) {
if (!new File(dvmPackage.getLocalWorkspace(), CommonConstants.LOADED).exists()) {
packagesToDownload.add(dvmPackage.id);
}
}

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;

View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;

View File

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;

View File

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;

View File

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;

View File

@@ -1,6 +1,6 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.Server.TestingSystemPass;
import _VisualDVM.Repository.Server.ServerCode;