v++
This commit is contained in:
@@ -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" +
|
||||
|
||||
Reference in New Issue
Block a user