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-22 20:25:26 +03:00
parent cee06af384
commit f811d9b3ac
18 changed files with 77 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ 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;
@@ -43,7 +44,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 = Global.visualiser.version;
target.visualiser_version = ComponentsSet.visualiser.version;
target.sapfor_version = Global.components.get(ComponentType.Sapfor_F).version;
target.sapfor_settings = (Global.mainModule.getDb()).settings.getSapforSettingsText();
target.percentage = 0;

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

@@ -5,6 +5,7 @@ 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;
@@ -28,7 +29,7 @@ public class CopyProject extends CurrentProjectPass {
}
@Override
public void Init(Object... params) {
fields.tfParent.setText(Global.visualiser.getWorkspace().getAbsolutePath());
fields.tfParent.setText(ComponentsSet.visualiser.getWorkspace().getAbsolutePath());
}
@Override
public void validateFields() {

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

@@ -5,6 +5,7 @@ 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;
@@ -26,7 +27,7 @@ public class CreateEmptyProject extends Pass<File> {
target = null;
if (ff.ShowDialog("Укажите имя создаваемого проекта", "NewProject")) {
project_name = ff.Result;
target = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), project_name).toFile();
target = Paths.get(ComponentsSet.visualiser.getWorkspace().getAbsolutePath(), project_name).toFile();
if (target.exists())
Log.Writeln("Файл\n" + Utils_.Brackets(target.getAbsolutePath()) + "\nуже существует");
return Log.isEmpty();

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

@@ -7,6 +7,7 @@ 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;
@@ -50,7 +51,7 @@ public class DownloadProject extends CurrentConnectionPass {
}
@Override
protected void performDone() throws Exception {
File project = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
File project = Paths.get(ComponentsSet.visualiser.getWorkspace().getAbsolutePath(),
Utils_.getDateName(src.name)).toFile();
if (Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) {
if (UI.Question("Проект " + Utils_.Brackets(src.name) + " успешно загружен. Открыть его"))

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

@@ -5,6 +5,7 @@ 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;
@@ -46,7 +47,7 @@ public class DownloadTest extends TestingSystemPass<Test> {
super.performDone();
if (Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(
target.getArchive().getAbsolutePath(),
Global.visualiser.getWorkspace().getAbsolutePath(), false
ComponentsSet.visualiser.getWorkspace().getAbsolutePath(), false
))
if (UI.Question("Тестовый проект успешно загружен под именем\n" +
Utils_.Brackets(target.getHomePath().getName()) +

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

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

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

@@ -5,6 +5,7 @@ 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;
@@ -24,7 +25,7 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
if (Global.mainModule.Check(Log, Current.BugReport) &&
(target = Global.mainModule.getBugReport()).CheckNotDraft(Log)) {
if (!target.project_version.isEmpty()) {
root = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
root = Paths.get(ComponentsSet.visualiser.getWorkspace().getAbsolutePath(),
target.id).toFile();
project = Paths.get(root.getAbsolutePath(),
Utils_.isWindows() ? Utils_.toW(target.project_version)

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

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

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

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

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

@@ -5,6 +5,7 @@ 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;
@@ -39,7 +40,7 @@ public class SaveGraph extends Pass<File> {
}
@Override
protected void body() throws Exception {
target = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), "Graph.png").toFile();
target = Paths.get(ComponentsSet.visualiser.getWorkspace().getAbsolutePath(), "Graph.png").toFile();
if (target.exists() && !target.delete())
throw new PassException("Не удается удалить предыдущий файл " + Utils_.Brackets(target.getAbsolutePath()));
//-