Merge branch 'V4.0' into check-client-token

ChangeLog

+4.0.27 06/07/2020
+------
 * Change updateImageData message for ploty version 1: give all the path of the image
+* Store plotyVersion in ConfigManager.
 
 4.0.26 01/07/2020
 ------

pom.xml

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

src/main/java/fr/ill/ics/bridge/ChangeManager.java

@@ -30,7 +30,6 @@ import fr.ill.ics.nscclient.notification.commandzone.sync.CommandZoneSyncEventCl
 import fr.ill.ics.nscclient.ploty.PlotyInstance;
 import fr.ill.ics.nscclient.sessionmanagement.SessionManager;
 import fr.ill.ics.nscclient.survey.SurveySubscriberImpl;
-import fr.ill.ics.util.ConfigManager;
 
 
 public class ChangeManager {

src/main/java/fr/ill/ics/nscclient/sessionmanagement/ServerSessionManager.java

@@ -152,7 +152,7 @@ public class ServerSessionManager {
     	SurveySubscriberImpl.getInstance(serverId).unsubscribe();
     	DataChangeSubscriber.getInstance(serverId).unsubscribe();
     	if (serverId.equals("real")) {
-    		if (SessionManager.getInstance(serverId).getPlotyVersion() == 2) {
+    		if (ConfigManager.getInstance().getPlotyVersion() == 2) {
     			PlotyInstance.getInstance().unsubscribe();
     		}
     	}
@@ -191,7 +191,7 @@ public class ServerSessionManager {
     	}	
     	
     	if (serverId.equals("real")) {
-    		if (SessionManager.getInstance(serverId).getPlotyVersion() == 2) {
+    		if (ConfigManager.getInstance().getPlotyVersion() == 2) {
     			try {
     				PlotyInstance.getInstance().unsubscribe();
     			} catch (Exception e) {

src/main/java/fr/ill/ics/util/ConfigManager.java

@@ -41,6 +41,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import fr.ill.ics.bridge.TokenManager;
+import fr.ill.ics.bridge.command.CommandZoneWrapper;
+import fr.ill.ics.nscclient.sessionmanagement.SessionManager;
 import fr.ill.ics.util.exception.CommandNotFoundException;
 import fr.ill.ics.util.exception.ConfigurationException;
 import fr.ill.ics.util.exception.ConfigurationException.PluginType;
@@ -128,6 +130,8 @@ public class ConfigManager {
 	public static String NOMADENDPOINT_DIRECTORY =System.getProperty("java.io.tmpdir") + FILE_SEPARATOR + "nomad";
 	public static String NOMADENDPOINT_FILE = "session.properties";
 
+	private int plotyVersion = 1;
+	
 	/**
 	 * @return the unique instance of this class
 	 */
@@ -676,4 +680,12 @@ public class ConfigManager {
 			}
 		}
 	}
+
+	public void setPlotyVersion() {
+		plotyVersion = SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).getPlotyVersion();
+	}
+	
+	public int getPlotyVersion() {
+		return plotyVersion;
+	}
 }