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

17
src/_VisualDVM/Global.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM;
import Common.Properties;
import Common.Utils.Loggable;
import Common.Utils.Utils_;
import Common.Visual.UI;
@@ -8,6 +7,7 @@ import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import _VisualDVM.Repository.Component.Sapfor.MessagesServer;
import _VisualDVM.Repository.Component.Visualiser;
import _VisualDVM.Repository.Component.Visualizer_2;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.TestingSystem.Common.TestingServer;
@@ -39,7 +39,6 @@ public class Global {
public static File BugReportsDirectory;
public static File BackUpsDirectory;
public static File TempDirectory;
public static File DownloadsDirectory;
public static File ProjectsDirectory;
public static File CompilationTasksDirectory;
public static File RunTasksDirectory;
@@ -56,11 +55,13 @@ public class Global {
public static ComponentsServer componentsServer = new ComponentsServer();
public static TestingServer testingServer = new TestingServer();
public static PerformanceAnalyzer performanceAnalyzer = null;
//------------------------------------------------------------------
public static Visualiser visualiser = null;
public static Visualizer_2 visualizer_2 = null;
public static void CheckVisualiserDirectories() {
Utils_.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName));
Utils_.CheckAndCleanDirectory(TempDirectory = new File(Utils_.getHomeDirectory(), Constants.TempDirectoryName));
Utils_.CheckDirectory(DataDirectory = new File(Utils_.getHomeDirectory(), Constants.DataDirectoryName));
Utils_.CheckDirectory(DownloadsDirectory = new File(Utils_.getHomeDirectory(), Constants.DownloadsDirectoryName));
//-
Utils_.CheckDirectory(RepoDirectory = new File(Utils_.getHomeDirectory(), Constants.RepoDirectoryName));
Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
@@ -132,8 +133,8 @@ public class Global {
componentsServer.db.Disconnect();
if (testingServer.db != null)
testingServer.db.Disconnect();
if (ComponentsSet.visualizer_2 != null)
ComponentsSet.visualizer_2.Shutdown();
if (visualizer_2 != null)
visualizer_2.Shutdown();
if (messagesServer != null)
messagesServer.Shutdown();
if (performanceAnalyzer != null)
@@ -156,9 +157,9 @@ public class Global {
CheckVisualiserDirectories();
CreateLogAtComponentsPath();
//-
ComponentsSet.visualizer_2 = new Visualizer_2(port);
ComponentsSet.visualizer_2.Connect();
ComponentsSet.visualizer_2.refreshPid();
visualizer_2 = new Visualizer_2(port);
visualizer_2.Connect();
visualizer_2.refreshPid();
//если делать раньше, то не удастся убить сервер.
if (Utils_.ContainsCyrillic(Utils_.getHomePath())) {
UI.Info("В пути к корневой папке " + Utils_.DQuotes(Utils_.getHomePath()) + "\n" +

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);

3
src/_VisualDVM/Repository/BugReport/BugReport.java
View File

@@ -10,7 +10,6 @@ import _VisualDVM.Repository.BugReport.Json.RecipientJson;
import _VisualDVM.Repository.BugReport.Json.RecipientsJson;
import _VisualDVM.Repository.BugReport.Json.VisualiserSettingsJson;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Subscribes.Subscriber;
import com.sun.org.glassfish.gmbal.Description;
@@ -50,7 +49,7 @@ public class BugReport extends rDBObject {
sender_name = sender_name_in;
sender_address = sender_address_in;
project_version = version_in;
visualiser_version = ComponentsSet.visualiser.version;
visualiser_version = Global.visualiser.version;
sapfor_version = Global.components.get(ComponentType.Sapfor_F).version;
packedSettingsJson = Utils_.gson.toJson(Global.mainModule.getProject().sapforProperties);
percentage = 0;

7
src/_VisualDVM/Repository/Component/ComponentsSet.java
View File

@@ -10,17 +10,14 @@ import _VisualDVM.Repository.Component.UI.ComponentsForm;
import javax.swing.*;
public class ComponentsSet extends DataSet<ComponentType, Component> {
//------------------------------------------------------------------
public static Visualiser visualiser = null;
public static Visualizer_2 visualizer_2 = null;
public boolean bad_state = false;
public boolean need_update = false;
public boolean need_publish = false;
public ComponentsSet() {
super(ComponentType.class, Component.class);
put(ComponentType.Visualiser, visualiser = new Visualiser());
put(ComponentType.Visualiser, Global.visualiser = new Visualiser());
put(ComponentType.Sapfor_F, (Component) MainModule_.instance.set(Current.Sapfor, new Sapfor_F()));
put(ComponentType.Visualizer_2, visualizer_2);
put(ComponentType.Visualizer_2, Global.visualizer_2);
put(ComponentType.PerformanceAnalyzer, Global.performanceAnalyzer = new PerformanceAnalyzer());
put(ComponentType.Instruction, new Instruction());
}

8
src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
View File

@@ -8,9 +8,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Repository.Component.OSDComponent;
import _VisualDVM.Repository.Component.Visualizer_2;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -355,7 +353,7 @@ public abstract class Sapfor extends OSDComponent {
@Override
public void Update() throws Exception {
super.Update();
ComponentsSet.visualizer_2.Command(getUpdateCommand());
Global.visualizer_2.Command(getUpdateCommand());
GetVersionInfo();
ResetAllAnalyses();
refreshPid();
@@ -383,7 +381,7 @@ public abstract class Sapfor extends OSDComponent {
}
public void Restart() throws Exception {
ResetAllAnalyses();
ComponentsSet.visualizer_2.Command(getRestartCommand());
Global.visualizer_2.Command(getRestartCommand());
refreshPid();
}
public void Interrupt() throws Exception {
@@ -478,7 +476,7 @@ public abstract class Sapfor extends OSDComponent {
sizes = null;
ModifiedFiles.clear();
//модификации.-------------------------------------------------------------->>>>
decodeString(ComponentsSet.visualizer_2.Command(request_in).replace((char) 1, '\n'));
decodeString(Global.visualizer_2.Command(request_in).replace((char) 1, '\n'));
}
//-
public int RunAnalysis(String analysisName,

17
src/_VisualDVM/Repository/Component/Visualiser.java
View File

@@ -1,4 +1,6 @@
package _VisualDVM.Repository.Component;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -60,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override
public void GetVersionInfo() {
version = 1140;
version = 1141;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());
@@ -68,17 +70,24 @@ public class Visualiser extends Component {
@Override
public void Update() throws Exception {
super.Update();
ComponentsSet.visualizer_2.SendRequest("update: ");
Global.visualizer_2.SendRequest("update: ");
System.exit(0);
}
public File getWorkspace() {
File res = Global.ProjectsDirectory;
//---
if (!Global.normalProperties.Workspace.isEmpty()) {
File workspace = new File(Global.normalProperties.Workspace);
if (workspace.exists())
return workspace;
res = workspace;
else
Global.mainModule.getPass(PassCode.UpdateProperty).Do("Workspace", "");
}
return Global.ProjectsDirectory;
return res;
}
public File getDownloadsDirectory(){
File res = new File(getWorkspace(), Constants.DownloadsDirectoryName);
Utils_.CheckDirectory(res);
return res;
}
}

3
src/_VisualDVM/TestingSystem/Common/Test/Test.java
View File

@@ -12,7 +12,6 @@ import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.Component.ComponentsSet;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;
@@ -65,7 +64,7 @@ public class Test extends riDBObject {
return new File(Global.TestsDirectory, String.valueOf(id));
}
public File getHomePath() {
return new File(Global.DownloadsDirectory, String.valueOf(id));
return new File(Global.visualiser.getDownloadsDirectory(), String.valueOf(id));
}
//--
public File getTempArchive() {

2
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -64,7 +64,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
public TestingServer() {
super(TestsDatabase.class);
name = Utils_.getDateName("testingServer");
System.out.println("ServerName=" + Utils_.Brackets(name));
}
public static void TimerOn() {
checkTimer = new Timer(Global.normalProperties.CheckTestingIntervalSeconds * 1000, e -> {
@@ -697,7 +696,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
account.email = Constants.MailAddress;
//-
int sapforId = Integer.parseInt(request.arg);
System.out.println("Sapfor_id = " + request.arg);
if (!db.serverSapfors.containsKey(sapforId)) {
Log.Writeln_("Версия SAPFOR " + sapforId + " не существует.");
return null;