Ploty2, integrate remote nomad server endpoint

ChangeLog

+4.0.22 25/06/2020
+------
+* Ploty2, integrate remote nomad server endpoint
+
 4.0.21 25/06/2020
 ------
 * getNomadServerEndpoint return address instead of name as getServerEndpoint

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fr.ill.ics</groupId>
 	<artifactId>nomadcommandsystem</artifactId>
-	<version>4.0.21</version>
+	<version>4.0.22</version>
 	<name>NomadCommandSystem</name>
 	<description>Java bridge for the communication with the Nomad server</description>
 	<scm>

src/main/java/fr/ill/ics/nscclient/ploty/PlotyInstance.java

@@ -26,12 +26,14 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import fr.ill.ics.bridge.command.CommandZoneWrapper;
 import fr.ill.ics.cameo.Application;
 import fr.ill.ics.cameo.Application.Info;
 import fr.ill.ics.cameo.ConnectionTimeout;
 import fr.ill.ics.cameo.RequesterCreationException;
 import fr.ill.ics.cameo.Server;
 import fr.ill.ics.core.property.Property;
+import fr.ill.ics.nscclient.sessionmanagement.SessionManager;
 import fr.ill.ics.ploty.DataPlotMessages;
 import fr.ill.ics.ploty.DataPlotMessages.Message;
 import fr.ill.ics.ploty.DataPlotMessages.PlotPropertyDataMessage;
@@ -81,7 +83,13 @@ public class PlotyInstance {
 
 		Application.Instance ploty = null;
 
-		String nomadServerEndpoint = ConfigManager.getInstance().getNomadServerEndpoint();
+		String nomadServerEndpoint;
+		if (ConfigManager.getInstance().isMainClient()) {
+			nomadServerEndpoint = ConfigManager.getInstance().getNomadServerEndpoint();
+		} else {
+			// nomad endpoint is build from selected instrument 
+			nomadServerEndpoint = "tcp://" + SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).getInstrumentName() + ":7000";
+		}
 		if (serverEndpoint.contentEquals(nomadServerEndpoint)) {
 			// Client on a same machine as server
 			try {