This commit is contained in:
2025-01-29 15:20:24 +03:00
parent f7de2590b9
commit ef5089443a
20 changed files with 60 additions and 60 deletions

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

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,

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