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

v++

Browse Source
This commit is contained in:
02090095
2025-01-29 15:20:24 +03:00
parent f7de2590b9
commit ef5089443a
20 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Repository.Component.ComponentsSet;
import java.io.File;
import java.nio.file.Files;
@@ -44,7 +43,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
target.sender_name = Global.mainModule.getAccount().name;
target.sender_address = Global.mainModule.getAccount().email;
target.project_version = "";
target.visualiser_version = ComponentsSet.visualiser.version;
target.visualiser_version = Global.visualiser.version;
target.sapfor_version = Global.components.get(ComponentType.Sapfor_F).version;
target.packedSettingsJson = "";
target.percentage = 0;

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

@@ -5,7 +5,6 @@ import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.CopyProjectFields;
import org.apache.commons.io.FileUtils;
@@ -29,7 +28,7 @@ public class CopyProject extends CurrentProjectPass {
}
@Override
public void Init(Object... params) {
fields.tfParent.setText(ComponentsSet.visualiser.getWorkspace().getAbsolutePath());
fields.tfParent.setText(Global.visualiser.getWorkspace().getAbsolutePath());
}
@Override
public void validateFields() {

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

@@ -5,7 +5,6 @@ import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Visual.Windows.FileNameForm;
import java.io.File;
@@ -27,7 +26,7 @@ public class CreateEmptyProject extends Pass<File> {
target = null;
if (ff.ShowDialog("Укажите имя создаваемого проекта", "NewProject")) {
project_name = ff.Result;
target = Paths.get(ComponentsSet.visualiser.getWorkspace().getAbsolutePath(), project_name).toFile();
target = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), project_name).toFile();
if (target.exists())
Log.Writeln("Файл\n" + Utils_.Brackets(target.getAbsolutePath()) + "\nуже существует");
return Log.isEmpty();

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

@@ -7,11 +7,9 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.CurrentConnectionPass;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Utils;
import java.io.File;
import java.nio.file.Paths;
public class DownloadProject extends CurrentConnectionPass {
private static final int maxSize = 10240;
boolean dialogOK = false;
@@ -51,7 +49,7 @@ public class DownloadProject extends CurrentConnectionPass {
}
@Override
protected void performDone() throws Exception {
File project = new File(Global.DownloadsDirectory, Utils_.getDateName(src.name));
File project = new File(Global.visualiser.getDownloadsDirectory(), Utils_.getDateName(src.name));
if (Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) {
if (UI.Question("Проект " + Utils_.Brackets(src.name) + " успешно загружен. Открыть его"))
Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(project);

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

@@ -5,12 +5,9 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingSystemPass;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.Test.Test;
import java.io.File;
public class DownloadTest extends TestingSystemPass<Test> {
@Override
public String getIconPath() {
@@ -51,7 +48,7 @@ public class DownloadTest extends TestingSystemPass<Test> {
super.performDone();
if (Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(
target.getArchive().getAbsolutePath(),
Global.DownloadsDirectory.getAbsolutePath(), false
Global.visualiser.getDownloadsDirectory().getAbsolutePath(), false
))
if (UI.Question("Тестовый проект успешно загружен под именем\n" +
Utils_.Brackets(target.getHomePath().getName()) +

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

@@ -3,7 +3,6 @@ import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.FileObject.DirInfo;
import _VisualDVM.GlobalData.FileObject.DirInfosDataSet;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Utils;
import java.io.File;
@@ -22,7 +21,7 @@ public class GetOldBugReports extends Pass<DirInfosDataSet> {
}
@Override
protected void body() throws Exception {
File downloadsDirectory = Global.DownloadsDirectory;
File downloadsDirectory = Global.visualiser.getDownloadsDirectory();
File[] files = downloadsDirectory.listFiles(pathname -> pathname.isDirectory() && pathname.getName().toLowerCase().startsWith("bugreport_"));
if (files != null) {
//---

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

@@ -5,10 +5,8 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.Component.ComponentsSet;
import java.io.File;
import java.nio.file.Paths;
public class OpenBugReportTestProject extends Pass<BugReport> {
File root = null;
File project = null;
@@ -25,7 +23,7 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
if (Global.componentsServer.db.CheckCurrent(Log, BugReport.class) &&
(target = Global.componentsServer.db.bugReports.getUI().getCurrent()).CheckNotDraft(Log)) {
if (!target.project_version.isEmpty()) {
root = new File(Global.DownloadsDirectory, target.id);
root = new File(Global.visualiser.getDownloadsDirectory(), target.id);
project = new File(root,

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

@@ -4,7 +4,6 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Repository.Component.ComponentsSet;
import java.io.File;
public class PublishComponentsServer extends RepositoryServerSSHPass {
@@ -30,7 +29,7 @@ public class PublishComponentsServer extends RepositoryServerSSHPass {
if (Global.mainModule.getPass(PassCode.PingComponentsServer).Do(true)) {
throw new PassException("Не удалось остановить сервер.");
}
File src = ComponentsSet.visualiser.getFile();
File src = Global.visualiser.getFile();
//-
RemoteFile dst = new RemoteFile(serverHome, getServerFileName());
user.connection.tryRM(dst);

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

@@ -4,7 +4,6 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
import _VisualDVM.Repository.Component.ComponentsSet;
import java.io.File;
public class PublishTestingServer extends RepositoryServerSSHPass {
@@ -30,7 +29,7 @@ public class PublishTestingServer extends RepositoryServerSSHPass {
if (Global.mainModule.getPass(PassCode.PingTestingServer).Do(true)) {
throw new PassException("Не удалось остановить сервер.");
}
File src = ComponentsSet.visualiser.getFile();
File src = Global.visualiser.getFile();
//-
RemoteFile dst = new RemoteFile(serverHome, getServerFileName());
user.connection.tryRM(dst);

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

@@ -5,7 +5,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
import _VisualDVM.Repository.Component.ComponentsSet;
import com.mxgraph.io.mxCodec;
import com.mxgraph.util.mxCellRenderer;
import com.mxgraph.util.mxXmlUtils;
@@ -40,7 +39,7 @@ public class SaveGraph extends Pass<File> {
}
@Override
protected void body() throws Exception {
target = Paths.get(ComponentsSet.visualiser.getWorkspace().getAbsolutePath(), "Graph.png").toFile();
target = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), "Graph.png").toFile();
if (target.exists() && !target.delete())
throw new PassException("Не удается удалить предыдущий файл " + Utils_.Brackets(target.getAbsolutePath()));
//-

4
src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java
View File

@@ -4,12 +4,10 @@ import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import java.io.File;
import java.nio.file.Paths;
public abstract class OpenSapforVersionPass extends Pass<SapforVersion_json> {
@Override
public String getIconPath() {
@@ -36,7 +34,7 @@ public abstract class OpenSapforVersionPass extends Pass<SapforVersion_json> {
protected void body() throws Exception {
SapforTask task = target.task;
ShowMessage1("Построение дерева версий и создание баз данных...");
File rootHome = new File(Global.DownloadsDirectory, Utils_.getDateName(task.test_description));
File rootHome = new File(Global.visualiser.getDownloadsDirectory(), Utils_.getDateName(task.test_description));
for (SapforVersion_json version_json : task.versions) {
ShowMessage2(version_json.version);