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