Library: converted nulls to checked exceptions, removed printStackTrace, added "dependencies" member

Author: Federico Fissore

app/src/processing/app/packages/Library.java

@@ -1,6 +1,6 @@
 package processing.app.packages;
 
-import static processing.app.helpers.StringMatchers.wildcardMatch;
+import processing.app.helpers.PreferencesMap;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 import java.util.Comparator;
 import java.util.List;
 
-import processing.app.helpers.PreferencesMap;
+import static processing.app.helpers.StringMatchers.wildcardMatch;
 
 public class Library {
 
@@ -18,16 +18,17 @@ public class Library {
   private File folder, srcFolder;
   private List<String> architectures;
   private boolean pre15Lib;
+  private List<String> dependencies;
 
   /**
    * Scans inside a folder and create a Library object out of it. Automatically
    * detects pre-1.5 libraries. Automatically fills metadata from
    * library.properties file if found.
-   * 
+   *
    * @param libFolder
    * @return
    */
-  static public Library create(File libFolder) {
+  static public Library create(File libFolder) throws IOException {
     // A library is considered "new" if it contains a file called
     // "library.properties"
     File check = new File(libFolder, "library.properties");
@@ -37,46 +38,50 @@ static public Library create(File libFolder) {
       return createLibrary(libFolder);
   }
 
-  private static Library createLibrary(File libFolder) {
+  private static Library createLibrary(File libFolder) throws IOException {
     // Parse metadata
     File propertiesFile = new File(libFolder, "library.properties");
     PreferencesMap properties = new PreferencesMap();
-    try {
-      properties.load(propertiesFile);
-    } catch (IOException e) {
-      e.printStackTrace();
-      return null;
-    }
+    properties.load(propertiesFile);
 
     // Library sanity checks
     // ---------------------
 
     // 1. Check mandatory properties
     if (!properties.containsKey("name"))
-      return null;
+      throw new IOException("Missing 'name' from library");
     if (!properties.containsKey("version"))
-      return null;
+      throw new IOException("Missing 'version' from library");
     if (!properties.containsKey("architectures"))
-      return null;
+      throw new IOException("Missing 'architectures' from library");
 
     // 2. Check mandatory folders
     File srcFolder = new File(libFolder, "src");
-    if (!srcFolder.exists() && !srcFolder.isDirectory())
-      return null;
-    
+    if (!srcFolder.exists() || !srcFolder.isDirectory())
+      throw new IOException("Missing 'src' folder");
+
     // TODO: 3. check if root folder contains prohibited stuff
-    
+
     // Extract metadata info
     // TODO: do for all metadata
     List<String> archs = new ArrayList<String>();
     for (String arch : properties.get("architectures").split(","))
       archs.add(arch.trim());
 
+    List<String> dependencies = new ArrayList<String>();
+    for (String dependency : properties.get("dependencies").split(",")) {
+      dependency = dependency.trim();
+      if (!dependency.equals("")) {
+        dependencies.add(dependency);
+      }
+    }
+
     Library res = new Library();
     res.folder = libFolder;
     res.srcFolder = srcFolder;
     res.name = properties.get("name").trim();
     res.architectures = archs;
+    res.dependencies = dependencies;
     res.version = properties.get("version").trim();
     res.pre15Lib = false;
     return res;
@@ -88,7 +93,7 @@ private static Library createPre15Library(File libFolder) {
     res.folder = libFolder;
     res.srcFolder = libFolder;
     res.name = libFolder.getName();
-    res.architectures = Arrays.asList(new String[] { "*" });
+    res.architectures = Arrays.asList(new String[]{"*"});
     res.pre15Lib = true;
     return res;
   }
@@ -133,4 +138,8 @@ public boolean isPre15Lib() {
   public File getFolder() {
     return folder;
   }
+
+  public List<String> getDependencies() {
+    return dependencies;
+  }
 }