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

46
src/_VisualDVM/Global.java
View File

@@ -9,9 +9,7 @@ import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.*;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import _VisualDVM.Repository.Component.Sapfor.MessagesServer;
import _VisualDVM.Repository.Component.Sapfor.Sapfor_F;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
@@ -53,10 +51,6 @@ public class Global {
public static File SapforPackagesDirectory;
public static File MachinesDirectory;
//------------------------------------------------------------------
public static Visualiser visualiser = null;
public static Visualizer_2 visualizer_2 = null;
public static PerformanceAnalyzer performanceAnalyzer = null;
//------------------------------------------------------------------
public static ComponentsServer componentsServer = new ComponentsServer();
public static TestingServer testingServer = new TestingServer();
public static void SynschronizeProperties() {
@@ -144,12 +138,12 @@ public class Global {
componentsServer.db.Disconnect();
if (testingServer.db != null)
testingServer.db.Disconnect();
if (visualizer_2 != null)
visualizer_2.Shutdown();
if (ComponentsSet.visualizer_2 != null)
ComponentsSet.visualizer_2.Shutdown();
if (messagesServer != null)
messagesServer.Shutdown();
if (performanceAnalyzer != null)
performanceAnalyzer.Shutdown();
if (ComponentsSet.performanceAnalyzer != null)
ComponentsSet.performanceAnalyzer.Shutdown();
} catch (Exception ex) {
if (Utils_.MainLog != null) {
Utils_.MainLog.PrintException(ex);
@@ -185,9 +179,9 @@ public class Global {
CheckVisualiserDirectories();
CreateLogAtComponentsPath();
//-
visualizer_2 = new Visualizer_2(port);
visualizer_2.Connect();
visualizer_2.refreshPid();
ComponentsSet.visualizer_2 = new Visualizer_2(port);
ComponentsSet.visualizer_2.Connect();
ComponentsSet.visualizer_2.refreshPid();
//если делать раньше, то не удастся убить сервер.
if (Utils_.ContainsCyrillic(Utils_.getHomePath())) {
UI.Info("В пути к корневой папке " + Utils_.DQuotes(Utils_.getHomePath()) + "\n" +
@@ -197,31 +191,19 @@ public class Global {
}
messagesServer = new MessagesServer();
messagesServer.Start();
components = new ComponentsSet();
mainModule.set(Current.ProjectView, ProjectView.Files);
components.put(ComponentType.Visualiser, visualiser = new Visualiser());
components.put(ComponentType.Sapfor_F, (Component) mainModule.set(Current.Sapfor, new Sapfor_F()));
components.put(ComponentType.Visualizer_2, visualizer_2);
components.put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer());
components.put(ComponentType.Instruction, new Instruction());
//-
components.initialVersionsCheck();
//-
AbstractTokenMakerFactory atmf = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance();
atmf.putMapping("text/FortranSPF", "_VisualDVM.Visual.Syntax.FortranSPFTokenMaker");
atmf.putMapping("text/FreeFortranSPF", "_VisualDVM.Visual.Syntax.FreeFortranSPFTokenMaker");
// FoldParserManager.get().addFoldParserMapping("text/FortranSPF", new FortranFolder()); блоки кода. todo
//light_editor.xml-------->>
//-------->>
if (properties.AutoUpdateSearch)
Global.mainModule.getPass(PassCode.GetComponentsActualVersions).Do();
components.validateStates();
if (components.needWindow()) {
if (components.needChanges()) {
boolean flag = true;
do {
Global.mainModule.getUI().getComponentsWindow().ShowDialog("");
if (flag = (!components.validateStates())) {
if (!UI.Question("Найдено " + components.bad_state + " некорректных необходимых компонент.Работа визуализатора невозможна.\n" +
if (!UI.Question("Обнаружены некорректные компоненты.Работа визуализатора невозможна.\n" +
"Вернуться к окну компонент"
)) {
UI.Info("Визуализатор завершает работу.");
@@ -230,6 +212,14 @@ public class Global {
}
} while (flag);
}
//--
//-
mainModule.set(Current.ProjectView, ProjectView.Files);
AbstractTokenMakerFactory atmf = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance();
atmf.putMapping("text/FortranSPF", "_VisualDVM.Visual.Syntax.FortranSPFTokenMaker");
atmf.putMapping("text/FreeFortranSPF", "_VisualDVM.Visual.Syntax.FreeFortranSPFTokenMaker");
// FoldParserManager.get().addFoldParserMapping("text/FortranSPF", new FortranFolder()); блоки кода. todo
//light_editor.xml-------->>
mainModule.ActivateDB();
mainModule.set(Current.Account, new Account() {
{

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

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

@@ -5,6 +5,7 @@ import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.Global;
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;
@@ -43,7 +44,7 @@ public class BugReport extends rDBObject {
sender_name = sender_name_in;
sender_address = sender_address_in;
project_version = version_in;
visualiser_version = Global.visualiser.version;
visualiser_version = ComponentsSet.visualiser.version;
sapfor_version = Global.components.get(ComponentType.Sapfor_F).version;
sapfor_settings = (Global.mainModule.getDb()).settings.getSapforSettingsText();
percentage = 0;

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

@@ -1,23 +1,35 @@
package _VisualDVM.Repository.Component;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import _VisualDVM.Repository.Component.Sapfor.Sapfor_F;
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 static PerformanceAnalyzer performanceAnalyzer = null;
public boolean bad_state = false;
public boolean need_update = false;
public boolean need_publish = false;
public boolean needWindow() {
public boolean needChanges() {
return bad_state || need_update;
}
public String getButtonIconPath() {
return needWindow() ? "/icons/ComponentsNeedUpdate.gif"
return needChanges() ? "/icons/ComponentsNeedUpdate.gif"
: (need_publish ? "/icons/ComponentsNeedPublish_2023.gif" : "/icons/ComponentsActual.png");
}
public ComponentsSet() {
super(ComponentType.class, Component.class);
put(ComponentType.Visualiser, visualiser = new Visualiser());
put(ComponentType.Sapfor_F, (Component) Global.mainModule.set(Current.Sapfor, new Sapfor_F()));
put(ComponentType.Visualizer_2, visualizer_2);
put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer());
put(ComponentType.Instruction, new Instruction());
}
@Override
public String getSingleDescription() {

5
src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
View File

@@ -4,6 +4,7 @@ import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Repository.Component.ComponentsSet;
import _VisualDVM.Utils;
import analyzer.common.MessageJtoJ;
@@ -102,7 +103,7 @@ public class PerformanceAnalyzer extends Component {
return null;
});
Utils.startScript(Global.TempDirectory, Global.ComponentsDirectory, "analyzer",
"java -jar -Dprism.order=sw " + Utils_.DQuotes(Global.performanceAnalyzer.getFile()) + " --port " + getPort() + " --version");
"java -jar -Dprism.order=sw " + Utils_.DQuotes(ComponentsSet.performanceAnalyzer.getFile()) + " --port " + getPort() + " --version");
//-
server_thread.join();
} catch (Exception ex) {
@@ -123,7 +124,7 @@ public class PerformanceAnalyzer extends Component {
process_thread = new Thread(() -> {
try {
Utils.startScript(Global.TempDirectory, Global.ComponentsDirectory, "analyzer",
"java -jar -Dprism.order=sw " + Utils_.DQuotes(Global.performanceAnalyzer.getFile()) + " --port " + getPort());
"java -jar -Dprism.order=sw " + Utils_.DQuotes(ComponentsSet.performanceAnalyzer.getFile()) + " --port " + getPort());
//-
} catch (Exception ex) {
ex.printStackTrace();

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

@@ -11,6 +11,7 @@ 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;
@@ -353,7 +354,7 @@ public abstract class Sapfor extends OSDComponent {
@Override
public void Update() throws Exception {
super.Update();
Global.visualizer_2.Command(getUpdateCommand());
ComponentsSet.visualizer_2.Command(getUpdateCommand());
GetVersionInfo();
ResetAllAnalyses();
refreshPid();
@@ -380,7 +381,7 @@ public abstract class Sapfor extends OSDComponent {
}
public void Restart() throws Exception {
ResetAllAnalyses();
Global.visualizer_2.Command(getRestartCommand());
ComponentsSet.visualizer_2.Command(getRestartCommand());
refreshPid();
}
public void Interrupt() throws Exception {
@@ -475,7 +476,7 @@ public abstract class Sapfor extends OSDComponent {
sizes = null;
ModifiedFiles.clear();
//модификации.-------------------------------------------------------------->>>>
decodeString(Global.visualizer_2.Command(request_in).replace((char) 1, '\n'));
decodeString(ComponentsSet.visualizer_2.Command(request_in).replace((char) 1, '\n'));
}
//-
public int RunAnalysis(String analysisName,

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

@@ -69,7 +69,7 @@ public class Visualiser extends Component {
@Override
public void Update() throws Exception {
super.Update();
Global.visualizer_2.SendRequest("update: ");
ComponentsSet.visualizer_2.SendRequest("update: ");
System.exit(0);
}
public File getWorkspace() {

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

@@ -12,6 +12,7 @@ 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;
@@ -64,7 +65,7 @@ public class Test extends riDBObject {
return new File(Global.TestsDirectory, String.valueOf(id));
}
public File getHomePath() {
return new File(Global.visualiser.getWorkspace(), String.valueOf(id));
return new File(ComponentsSet.visualiser.getWorkspace(), String.valueOf(id));
}
//--
public File getTempArchive() {