Bug fixed: files for family plugins were no longer read since moved in

resources directory

src/main/java/fr/ill/ics/client/control/plugin/PluginManager.java

@@ -18,8 +18,11 @@
 
 package fr.ill.ics.client.control.plugin;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -32,6 +35,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import fr.ill.ics.bridge.Controller;
 import fr.ill.ics.bridge.ControllerManager;
@@ -56,7 +61,6 @@ import fr.ill.ics.nscclient.dataprovider.ServantDatabase;
 import fr.ill.ics.nscclient.servant.ClientServantDescriptor;
 import fr.ill.ics.nscclient.servant.ResourceNotFoundException;
 import fr.ill.ics.util.ConfigManager;
-import fr.ill.ics.util.FileHelper;
 import fr.ill.ics.util.exception.ConfigurationException.PluginType;
 import fr.ill.ics.util.exception.ControllerNotFoundException;
 import fr.ill.ics.util.exception.PropertyNotFoundException;
@@ -68,6 +72,9 @@ import fr.ill.ics.util.exception.PropertyNotFoundException;
  */
 public class PluginManager {
 
+	private static final Logger LOGGER = Logger.getLogger(PluginManager.class.getName());
+
+
 	public final static String PLUGIN_PATTERN = "Plugin.xml";
 	public final static String PLOTDATAS_PATTERN = "PlotDatas.xml";
 
@@ -145,16 +152,33 @@ public class PluginManager {
 			}
 		}
 
-		// Families
-		String[] familyFiles = FileHelper.getFilesListByExtension(ConfigManager.FAMILIES_DIRECTORY, "xml", true, true);
-		if (familyFiles != null) {
-			for (int i = 0; i < familyFiles.length; i++) {
-				String fileName = familyFiles[i];
-				parseFile(parser, fileName);
-				storeDescriptor(parser);
+
+		try {
+			InputStream stream = ConfigManager.class.getClassLoader().getResourceAsStream(ConfigManager.FAMILIES_DIRECTORY + ConfigManager.LIST_FILE);
+			if (stream != null) {
+				BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+				String fileName = reader.readLine();
+				while (fileName != null) {
+					fileName = ConfigManager.FAMILIES_DIRECTORY + fileName;
+					InputStream inputStream = PluginManager.class.getClassLoader().getResourceAsStream(fileName);
+					if (inputStream != null) {
+						String fileContent = new String(inputStream.readAllBytes());
+						parseString(parser, fileContent);
+						storeDescriptor(parser);
+					}
+					fileName = reader.readLine();
+				}
+				reader.close();
+				stream.close();
+			} else {
+				LOGGER.log(Level.SEVERE, "File " + ConfigManager.FAMILIES_DIRECTORY + ConfigManager.LIST_FILE + " not found");
 			}
+		} catch (IOException e) {
+			LOGGER.log(Level.SEVERE, "File " + ConfigManager.FAMILIES_DIRECTORY + ConfigManager.LIST_FILE + " not found");
+			e.printStackTrace();
 		}
 
+
 		// The file listing images for families is now stored in the server part
 		String fileName = "FamilyImageKeys.xml";
 		try {
@@ -719,7 +743,7 @@ public class PluginManager {
 		return false;
 	}
 
-	
+
 	/**
 	 * 
 	 * @param nodeText