Adapt PropertyManager class for compatibility with NomadServerGUI

src/fr/ill/ics/core/property/PropertyManager.java

@@ -79,6 +79,8 @@ public class PropertyManager {
 
 	private Map<String, String> sizePropertyNames; // KEY=controllerType.propertyName VALUE=size property name
 
+	private String nomadHome;
+
 	/** -------------------------------------------------------------------------------------------------- **/ 
 
 	private static PropertyManager instance = null;
@@ -99,6 +101,8 @@ public class PropertyManager {
 	 *
 	 */
 	public void init() {
+		nomadHome = System.getenv("NOMADCLIENT_HOME");
+
 		clientFilesFoundPerControllerType = new HashMap<String, Boolean>();
 		sizePropertyNames = new HashMap<String, String>();
 		propertyParser = new PropertyParser();
@@ -114,6 +118,7 @@ public class PropertyManager {
 		Iterator<ClientServantDescriptor> it = ServantDatabase.getInstance().getDrivers().iterator();
 		while (it.hasNext()) {
 			ClientServantDescriptor descriptor = it.next();
+			
 			boolean clientFilesExist = readPropertiesClientFilesFor(descriptor.getType());
 			if (clientFilesExist) {
 				Controller controller = DriverManager.getInstance().getDriver(descriptor.getName());
@@ -151,7 +156,13 @@ public class PropertyManager {
 			return clientFilesFoundPerControllerType.get(controllerType);
 		}
 		
-		String[] files = FileHelper.getFilesListByExtension(ConfigManager.CONTROLLERS_DIRECTORY + controllerType + ConfigManager.FILE_SEPARATOR, ConfigManager.PROPERTIES_PATTERN, true, true);
+		// Necessary for NomadServerGUI: the client project of the PropertyManager can be another project that NomadGUI, but the client files remain in NomadGUI
+		String prefix = "";
+		if (nomadHome != null) {
+			prefix = nomadHome + ConfigManager.FILE_SEPARATOR;
+		}
+		
+		String[] files = FileHelper.getFilesListByExtension(prefix + ConfigManager.CONTROLLERS_DIRECTORY + controllerType + ConfigManager.FILE_SEPARATOR, ConfigManager.PROPERTIES_PATTERN, true, true);
 		if (files == null || files.length == 0) {
 
 			// Search on server side

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

@@ -151,8 +151,18 @@ public class ConfigManager {
 		properties = new Properties();
 
 		// Load all properties file from conf directory
-		List<String> propertiesFiles = new ArrayList<String>(Arrays.asList(FileHelper.getFilesListByExtension(CLIENT_CONF_DIRECTORY, PROPERTIES_EXTENSION, true, true)));
-		propertiesFiles.addAll(new ArrayList<String>(Arrays.asList(FileHelper.getFilesListByExtension(SERVER_CONF_DIRECTORY, PROPERTIES_EXTENSION, true, true))));
+		List<String> propertiesFiles = new ArrayList<String>();
+
+
+		String[] files = FileHelper.getFilesListByExtension(CLIENT_CONF_DIRECTORY, PROPERTIES_EXTENSION, true, true);
+		if (files!= null) {
+			propertiesFiles.addAll(Arrays.asList(files));
+		}
+
+		files = FileHelper.getFilesListByExtension(SERVER_CONF_DIRECTORY, PROPERTIES_EXTENSION, true, true);
+		if (files != null) {
+			propertiesFiles.addAll(Arrays.asList(files));
+		}
 
 		Iterator<String> it = propertiesFiles.iterator();
 		while (it.hasNext()) {