Commit 1b1700ab authored by Locatelli's avatar Locatelli

Correct bug

VirtualHome was setting after properties reading
parent 5932f195
4.0.10 DD/MM/YYYY
------
* VirtualHome was setting after properties reading
4.0.9 19/05/2020
-----
......
......@@ -233,12 +233,9 @@ public class MainWindow implements ServerConfigurationChangeListener, ServerEnde
public void init() {
ConfigManager.initInstance();
if (virtualHomeValue != null) {
ConfigManager.getInstance().setLocalFilesDirectory(virtualHomeValue);
}
ConfigManager.initInstance(virtualHomeValue);
// Create logs directory if it doesn't exist
File logsDirectory = new File(ConfigManager.getInstance().getString("logsDirectory"));
if (!logsDirectory.exists()) {
......
......@@ -71,7 +71,7 @@ public class NomadLite {
}
public void init() {
ConfigManager.initInstance();
ConfigManager.initInstance("");
Nomad.setLite();
String[] cameoArgs = {ConfigManager.getInstance().getServerEndpoint() + ":nomadgui"};
Application.This.init(cameoArgs);
......
......@@ -97,7 +97,7 @@ public class TestNomadPlots {
dataY = new Float64Array(Array.INIT_INCR, ySize);
dataZ = new Float64Array(Array.INIT_ZERO, xSize * ySize);
ConfigManager.initInstance();
ConfigManager.initInstance("");
SWTImageFactory.getInstance().init(display);
SWTFontFactory.getInstance().init(display);
((SWTColorFactory) ColorFactory.getInstance()).init(display);
......
......@@ -517,7 +517,7 @@ public class SWTLogWindow extends LogWindow {
if (loginStatus == ServerConnection.LOGIN_OK) {
Display display = new Display();
ConfigManager.initInstance();
ConfigManager.initInstance("");
Nomad.setStandalone();
SWTImageFactory.getInstance().init(display);
SWTFontFactory.getInstance().init(display);
......
......@@ -33,7 +33,7 @@ public class TestFocusLost implements ICanvasClickListener {
private void run() {
SWTImageFactory.getInstance().init();
ConfigManager.initInstance();
ConfigManager.initInstance("");
Display display = new Display();
Shell mainShell = new Shell(display);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment