no message
This commit is contained in:
@@ -48,8 +48,6 @@ public class Global {
|
||||
public static MessagesServer messagesServer = null;
|
||||
//--------------------------------------------------
|
||||
public static GlobalDatabase db = null;
|
||||
//-
|
||||
public static String Home;
|
||||
public static File ComponentsDirectory;
|
||||
public static File DataDirectory;
|
||||
public static File BugReportsDirectory;
|
||||
@@ -74,16 +72,12 @@ public class Global {
|
||||
//------------------------------------------------------------------
|
||||
public static ComponentsServer componentsServer = new ComponentsServer();
|
||||
public static TestingServer testingServer = new TestingServer();
|
||||
//------------------------------------------------------------------
|
||||
public static boolean isWindows;
|
||||
public static int bad_state = 0;
|
||||
public static int need_update = 0;
|
||||
public static int need_publish = 0;
|
||||
//------------------------------------------------------------------------
|
||||
public static Loggable Log;
|
||||
public static void SynschronizeProperties() {
|
||||
try {
|
||||
File new_propertiesFile = Paths.get(Home, "properties").toFile();
|
||||
File new_propertiesFile = Paths.get(CommonUtils.Home, "properties").toFile();
|
||||
if (new_propertiesFile.exists())
|
||||
properties = (GlobalProperties) CommonUtils.jsonFromFile(new_propertiesFile, GlobalProperties.class);
|
||||
CommonUtils.jsonToFile(properties, new_propertiesFile);
|
||||
@@ -92,48 +86,48 @@ public class Global {
|
||||
}
|
||||
}
|
||||
public static void CheckVisualiserDirectories() {
|
||||
Utils.CheckDirectory(ComponentsDirectory = Paths.get(Home, Constants.ComponentsDirectoryName).toFile());
|
||||
Utils.CheckAndCleanDirectory(TempDirectory = Paths.get(Home, Constants.TempDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DataDirectory = Paths.get(Home, Constants.DataDirectoryName).toFile());
|
||||
Utils.CheckDirectory(ComponentsDirectory = Paths.get(CommonUtils.Home, Constants.ComponentsDirectoryName).toFile());
|
||||
Utils.CheckAndCleanDirectory(TempDirectory = Paths.get(CommonUtils.Home, Constants.TempDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DataDirectory = Paths.get(CommonUtils.Home, Constants.DataDirectoryName).toFile());
|
||||
//-
|
||||
Utils.CheckDirectory(RepoDirectory = Paths.get(Home, Constants.RepoDirectoryName).toFile());
|
||||
Utils.CheckDirectory(BugReportsDirectory = Paths.get(Home, Constants.BugsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(BackUpsDirectory = Paths.get(Home, Constants.BackUpsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(ProjectsDirectory = Paths.get(Home, Constants.ProjectsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(CompilationTasksDirectory = Paths.get(Home, Constants.CompilationTasksDirectoryName).toFile());
|
||||
Utils.CheckDirectory(RunTasksDirectory = Paths.get(Home, Constants.RunTasksDirectoryName).toFile());
|
||||
Utils.CheckDirectory(StsDirectory = Paths.get(Home, Constants.StsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(TestsDirectory = Paths.get(Home, Constants.TestsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(PerformanceAnalyzerDirectory = Paths.get(Home, Constants.PerformanceAnalyzerDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DVMPackagesDirectory = Paths.get(Home, Constants.DVMPackagesDirectoryName).toFile());
|
||||
Utils.CheckDirectory(RepoDirectory = Paths.get(CommonUtils.Home, Constants.RepoDirectoryName).toFile());
|
||||
Utils.CheckDirectory(BugReportsDirectory = Paths.get(CommonUtils.Home, Constants.BugsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(BackUpsDirectory = Paths.get(CommonUtils.Home, Constants.BackUpsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(ProjectsDirectory = Paths.get(CommonUtils.Home, Constants.ProjectsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(CompilationTasksDirectory = Paths.get(CommonUtils.Home, Constants.CompilationTasksDirectoryName).toFile());
|
||||
Utils.CheckDirectory(RunTasksDirectory = Paths.get(CommonUtils.Home, Constants.RunTasksDirectoryName).toFile());
|
||||
Utils.CheckDirectory(StsDirectory = Paths.get(CommonUtils.Home, Constants.StsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(TestsDirectory = Paths.get(CommonUtils.Home, Constants.TestsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(PerformanceAnalyzerDirectory = Paths.get(CommonUtils.Home, Constants.PerformanceAnalyzerDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DVMPackagesDirectory = Paths.get(CommonUtils.Home, Constants.DVMPackagesDirectoryName).toFile());
|
||||
//через пару версий заменить на clean.
|
||||
Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
|
||||
Utils.CheckDirectory(MachinesDirectory = Paths.get(Home, "Machines").toFile());
|
||||
Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(CommonUtils.Home, "SapforPackages").toFile());
|
||||
Utils.CheckDirectory(MachinesDirectory = Paths.get(CommonUtils.Home, "Machines").toFile());
|
||||
}
|
||||
public static void CheckServerDirectories() {
|
||||
Utils.CheckDirectory(ComponentsDirectory = Paths.get(Home, Constants.ComponentsDirectoryName).toFile());
|
||||
Utils.CheckAndCleanDirectory(TempDirectory = Paths.get(Home, Constants.TempDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DataDirectory = Paths.get(Home, Constants.DataDirectoryName).toFile());
|
||||
Utils.CheckDirectory(ComponentsDirectory = Paths.get(CommonUtils.Home, Constants.ComponentsDirectoryName).toFile());
|
||||
Utils.CheckAndCleanDirectory(TempDirectory = Paths.get(CommonUtils.Home, Constants.TempDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DataDirectory = Paths.get(CommonUtils.Home, Constants.DataDirectoryName).toFile());
|
||||
//-
|
||||
Utils.CheckDirectory(BugReportsDirectory = Paths.get(Home, Constants.BugsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DataBackUpsDirectory = Paths.get(Home, Constants.DataBackUpsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(MachinesDirectory = Paths.get(Home, "Machines").toFile());
|
||||
Utils.CheckDirectory(BugReportsDirectory = Paths.get(CommonUtils.Home, Constants.BugsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DataBackUpsDirectory = Paths.get(CommonUtils.Home, Constants.DataBackUpsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(MachinesDirectory = Paths.get(CommonUtils.Home, "Machines").toFile());
|
||||
}
|
||||
public static void CheckTestingSystemDirectories() {
|
||||
Utils.CheckDirectory(ComponentsDirectory = Paths.get(Home, Constants.ComponentsDirectoryName).toFile());
|
||||
Utils.CheckAndCleanDirectory(TempDirectory = Paths.get(Home, Constants.TempDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DataDirectory = Paths.get(Home, Constants.DataDirectoryName).toFile());
|
||||
Utils.CheckDirectory(ComponentsDirectory = Paths.get(CommonUtils.Home, Constants.ComponentsDirectoryName).toFile());
|
||||
Utils.CheckAndCleanDirectory(TempDirectory = Paths.get(CommonUtils.Home, Constants.TempDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DataDirectory = Paths.get(CommonUtils.Home, Constants.DataDirectoryName).toFile());
|
||||
//-
|
||||
Utils.CheckDirectory(TestsDirectory = Paths.get(Home, Constants.TestsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(RepoDirectory = Paths.get(Home, Constants.RepoDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DVMPackagesDirectory = Paths.get(Home, Constants.DVMPackagesDirectoryName).toFile());
|
||||
Utils.CheckDirectory(SapforsDirectory = Paths.get(Home, "Sapfors").toFile());
|
||||
Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
|
||||
Utils.CheckDirectory(TestsDirectory = Paths.get(CommonUtils.Home, Constants.TestsDirectoryName).toFile());
|
||||
Utils.CheckDirectory(RepoDirectory = Paths.get(CommonUtils.Home, Constants.RepoDirectoryName).toFile());
|
||||
Utils.CheckDirectory(DVMPackagesDirectory = Paths.get(CommonUtils.Home, Constants.DVMPackagesDirectoryName).toFile());
|
||||
Utils.CheckDirectory(SapforsDirectory = Paths.get(CommonUtils.Home, "Sapfors").toFile());
|
||||
Utils.CheckDirectory(SapforPackagesDirectory = Paths.get(CommonUtils.Home, "SapforPackages").toFile());
|
||||
//CheclAndClean через неделю
|
||||
Utils.CheckDirectory(MachinesDirectory = Paths.get(Home, "Machines").toFile());
|
||||
Utils.CheckDirectory(MachinesDirectory = Paths.get(CommonUtils.Home, "Machines").toFile());
|
||||
}
|
||||
public static void CreateLogAtComponentsPath() {
|
||||
Log = new Loggable() {
|
||||
CommonUtils.MainLog = new Loggable() {
|
||||
@Override
|
||||
public String getLogHomePath() {
|
||||
return Paths.get(System.getProperty("user.dir"), "Components").toString();
|
||||
@@ -143,20 +137,20 @@ public class Global {
|
||||
return "VisualDVM";
|
||||
}
|
||||
};
|
||||
Log.ClearLog();
|
||||
CommonUtils.MainLog.ClearLog();
|
||||
}
|
||||
public static void CreateLogAtHome() {
|
||||
Log = new Loggable() {
|
||||
CommonUtils.MainLog = new Loggable() {
|
||||
@Override
|
||||
public String getLogHomePath() {
|
||||
return Home;
|
||||
return CommonUtils.Home;
|
||||
}
|
||||
@Override
|
||||
public String getLogName() {
|
||||
return Current.mode.toString();
|
||||
}
|
||||
};
|
||||
Log.ClearLog();
|
||||
CommonUtils.MainLog.ClearLog();
|
||||
}
|
||||
//-
|
||||
public static void FinishApplication() {
|
||||
@@ -173,8 +167,8 @@ public class Global {
|
||||
if (performanceAnalyzer != null)
|
||||
performanceAnalyzer.Shutdown();
|
||||
} catch (Exception ex) {
|
||||
if (Log != null) {
|
||||
Log.PrintException(ex);
|
||||
if (CommonUtils.MainLog != null) {
|
||||
CommonUtils.MainLog.PrintException(ex);
|
||||
} else {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
@@ -263,7 +257,7 @@ public class Global {
|
||||
}
|
||||
}
|
||||
public static void NormalMode(int port) throws Exception {
|
||||
isWindows = System.getProperty("os.name").startsWith("Windows");
|
||||
CommonUtils.isWindows = System.getProperty("os.name").startsWith("Windows");
|
||||
removeOldDatabases();
|
||||
CheckVisualiserDirectories();
|
||||
CreateLogAtComponentsPath();
|
||||
@@ -272,8 +266,8 @@ public class Global {
|
||||
visualizer_2.Connect();
|
||||
visualizer_2.refreshPid();
|
||||
//если делать раньше, то не удастся убить сервер.
|
||||
if (CommonUtils.ContainsCyrillic(Global.Home)) {
|
||||
UI.Info("В пути к корневой папке " + CommonUtils.DQuotes(Global.Home) + "\n" +
|
||||
if (CommonUtils.ContainsCyrillic(CommonUtils.Home)) {
|
||||
UI.Info("В пути к корневой папке " + CommonUtils.DQuotes(CommonUtils.Home) + "\n" +
|
||||
"Найдены русские буквы.\n" +
|
||||
"Визуализатор завершает работу."); //
|
||||
FinishApplication();
|
||||
@@ -284,7 +278,6 @@ public class Global {
|
||||
Current.CreateAll();
|
||||
UI.CreateAll();
|
||||
Pass_2021.CreateAll();
|
||||
Utils.init();
|
||||
//единственное меню до остальных.
|
||||
CommonUI.menuBars.put(ComponentsSet.class, new ComponentsMenuBar());
|
||||
Components = new ComponentsSet();
|
||||
@@ -349,7 +342,7 @@ public class Global {
|
||||
UI.CreateWindows();
|
||||
}
|
||||
public static void ServerMode() throws Exception {
|
||||
isWindows = false;
|
||||
CommonUtils.isWindows = false;
|
||||
CheckServerDirectories();
|
||||
CreateLogAtComponentsPath();
|
||||
Utils.createEmptyFile("kek");
|
||||
@@ -359,7 +352,7 @@ public class Global {
|
||||
System.exit(0);
|
||||
}
|
||||
public static void TestingSystemMode() throws Exception {
|
||||
isWindows = false;
|
||||
CommonUtils.isWindows = false;
|
||||
CheckTestingSystemDirectories();
|
||||
CreateLogAtComponentsPath();
|
||||
testingServer = new TestingServer();
|
||||
@@ -370,7 +363,7 @@ public class Global {
|
||||
}
|
||||
//режим запуска пакета Сапфор
|
||||
public static void PackageMode() throws Exception {
|
||||
isWindows = System.getProperty("os.name").startsWith("Windows");
|
||||
CommonUtils.isWindows = System.getProperty("os.name").startsWith("Windows");
|
||||
CreateLogAtHome();
|
||||
PackageModeSupervisor planner = new PackageModeSupervisor();
|
||||
planner.Start();
|
||||
@@ -390,8 +383,8 @@ public class Global {
|
||||
//---
|
||||
public static void Init(String... args) {
|
||||
System.out.println("VisualSapfor.jar started..");
|
||||
Home = System.getProperty("user.dir"); //если Linux, дает без слеша в конце !!!
|
||||
System.out.println("home directory is" + CommonUtils.Brackets(Home));
|
||||
CommonUtils.Home = System.getProperty("user.dir"); //если Linux, дает без слеша в конце !!!
|
||||
System.out.println("home directory is" + CommonUtils.Brackets(CommonUtils.Home));
|
||||
//---
|
||||
SynschronizeProperties();
|
||||
Current.mode = properties.Mode;
|
||||
@@ -422,8 +415,8 @@ public class Global {
|
||||
} catch (Exception ex) {
|
||||
System.out.println("VISUALISER FAILED");
|
||||
ex.printStackTrace();
|
||||
if (Global.Log != null)
|
||||
Global.Log.PrintException(ex);
|
||||
if (CommonUtils.MainLog != null)
|
||||
CommonUtils.MainLog.PrintException(ex);
|
||||
FinishApplication();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user