Add methods for getting controller and family icon keys map from server

(needed for tablette client)

ChangeLog

-3.1.1
+3.1.2 DD/MM/YYYY
+-----
+* Add methods for getting controller and family icon keys map from server (needed for tablette client)
+
+3.1.1 19/10/2017
 -----
 * Catch exception thrown when trying to format a invalid float value (avoid a client crash : see brisp 03 nov 2016).
 * Replaced Corba with Cameo. 

pom.xml

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

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

@@ -152,4 +152,9 @@ public class DriverManager {
 			ServantManagerAccessor.getInstance(serverId).reconnectDriver(driver.getDatabaseId(), driver.getId());
 		}
 	}
+	
+	public Set<String> getDriverTypes() {
+		return ServantDatabase.getInstance().getDriverTypes();
+	}
+
 }
\ No newline at end of file

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

@@ -19,6 +19,8 @@
 package fr.ill.ics.bridge;
 
 
+import java.util.HashMap;
+
 import fr.ill.ics.nscclient.dataprovider.ServantManagerAccessor;
 import fr.ill.ics.nscclient.servant.ResourceNotFoundException;
 
@@ -104,4 +106,13 @@ public class ResourceManager {
 		}
 		*/
 	}
+	
+	public HashMap<String, String> getFamilyImageKeys() {
+		return ServantManagerAccessor.getInstance(serverId).getFamilyImageKeys();
+	}
+
+	public HashMap<String, String> getControllerIconKeys() {
+		return ServantManagerAccessor.getInstance(serverId).getControllerIconKeys();
+	}
+
 }

src/main/java/fr/ill/ics/nscclient/dataprovider/DataAccessor.java

@@ -563,6 +563,9 @@ public class DataAccessor {
 				logError("getInt32Array", response.getError(), propertyID);	
 			}
 			else {
+				
+				
+				
 				int[] result = new int[response.getValueList().size()];
 				List<Integer> values = response.getValueList();
 				

src/main/java/fr/ill/ics/nscclient/dataprovider/ServantDatabase.java

@@ -142,6 +142,15 @@ public class ServantDatabase {
 		return controllerTypes;
 	}
 	
+	public Set<String> getDriverTypes() {
+		Set<String> driverTypes = new TreeSet<String>();
+		Iterator<ClientServantDescriptor> it = drivers.values().iterator();
+		while (it.hasNext()) {
+			driverTypes.add(it.next().getType());
+		}
+		return driverTypes;
+	}
+	
 	
 	public boolean controllerIsEnabled(String controllerName) {
 		ClientServantDescriptor descriptor = getControllerDescriptor(controllerName);

src/main/java/fr/ill/ics/nscclient/dataprovider/ServantManagerAccessor.java

@@ -949,6 +949,64 @@ public class ServantManagerAccessor {
 	
 		return null;
 	}
+
+	public HashMap<String, String> getFamilyImageKeys() {
+		
+		// Create the message type.
+		ServantManagerRequest.Message type = ServantManagerRequest.Message.newBuilder()
+													.setType(ServantManagerRequest.Message.Type.GetFamilyImageKeys)
+													.build();
+
+		// Create the request.
+		ServantManagerRequest.EmptyRequest request = ServantManagerRequest.EmptyRequest.newBuilder().build();
+		
+		servantManagerRequester.sendTwoParts(type.toByteArray(), request.toByteArray());
+		
+		try {
+			Common.StringMapResponse response = Common.StringMapResponse.parseFrom(servantManagerRequester.receive());
+			HashMap<String, String> values = new HashMap<String, String>();
+			Iterator<Common.StringAndKey> p = response.getMapList().iterator();
+			while (p.hasNext()) {
+				Common.StringAndKey avalue = p.next();
+				values.put(avalue.getKey(), avalue.getValue());
+			}
+			return values;
+		}
+		catch (InvalidProtocolBufferException e) {
+			LOGGER.logp(Level.WARNING, this.getClass().getName(), "getFamilyImageKeys", "error in parsing response");
+		}
+	
+		return null;
+	}
+
+	public HashMap<String, String> getControllerIconKeys() {
+		
+		// Create the message type.
+		ServantManagerRequest.Message type = ServantManagerRequest.Message.newBuilder()
+													.setType(ServantManagerRequest.Message.Type.GetControllerIconKeys)
+													.build();
+
+		// Create the request.
+		ServantManagerRequest.EmptyRequest request = ServantManagerRequest.EmptyRequest.newBuilder().build();
+		
+		servantManagerRequester.sendTwoParts(type.toByteArray(), request.toByteArray());
+		
+		try {
+			Common.StringMapResponse response = Common.StringMapResponse.parseFrom(servantManagerRequester.receive());
+			HashMap<String, String> values = new HashMap<String, String>();
+			Iterator<Common.StringAndKey> p = response.getMapList().iterator();
+			while (p.hasNext()) {
+				Common.StringAndKey avalue = p.next();
+				values.put(avalue.getKey(), avalue.getValue());
+			}
+			return values;
+		}
+		catch (InvalidProtocolBufferException e) {
+			LOGGER.logp(Level.WARNING, this.getClass().getName(), "getControllerIconKeys", "error in parsing response");
+		}
 	
+		return null;
+	}
+
 	
 }
\ No newline at end of file

src/main/java/fr/ill/ics/nscclient/notification/commandzone/ServerCommandZoneEventManager.java

@@ -155,23 +155,25 @@ public class ServerCommandZoneEventManager {
 	}
 	
 	public void reset() {
-		System.out.println("Unsubscribing command zone...");
-		
-		// Stop the subscriber.
-		subscriber.cancel();
-		
-		// Join the thread.
-		try {
-			subscriberThread.join();
-		}
-		catch (InterruptedException e) {
-			e.printStackTrace();
+		if (subscriber != null) {
+			System.out.println("Unsubscribing command zone...");
+			
+			// Stop the subscriber.
+			subscriber.cancel();
+			
+			// Join the thread.
+			try {
+				subscriberThread.join();
+			}
+			catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+			
+			// Terminate the subscriber.
+			subscriber.terminate();
+			
+			System.out.println("Unsubscribed from the command zone");
 		}
-		
-		// Terminate the subscriber.
-		subscriber.terminate();
-		
-		System.out.println("Unsubscribed from the command zone");
 	}
 	
 	private void notifyCommandZoneStarted(CommandZoneChanged message) {