Merge pull request #419 from rlogiacco/feature/library-manager

Feature: library manager

Author: jantje

it.baeyens.arduino.core/src/it/baeyens/arduino/managers/Library.java

@@ -21,7 +21,7 @@
 import it.baeyens.arduino.common.ConfigurationPreferences;
 import it.baeyens.arduino.ui.Activator;
 
-public class Library implements Comparator<Library> {
+public class Library implements Comparable<Library> {
 
     private String name;
     private String version;
@@ -210,8 +210,8 @@ public Collection<Path> getSources(IProject project) {
     }
 
     @Override
-    public int compare(Library o1, Library o2) {
-	return o1.getName().compareTo(o2.getName());
+    public int compareTo(Library other) {
+	return this.name.compareTo(other.name);
     }
 
     public IStatus remove(IProgressMonitor monitor) {

it.baeyens.arduino.core/src/it/baeyens/arduino/managers/LibraryIndex.java

@@ -10,92 +10,93 @@
 
 public class LibraryIndex {
 
-    private List<Library> libraries;
-
-    // category name to library name
-    private Map<String, Set<String>> categories = new HashMap<>();
-    // library name to latest version of library
-    private Map<String, Library> latestLibs = new HashMap<>();
-
-    public void resolve() {
-	for (Library library : this.libraries) {
-	    String name = library.getName();
-
-	    String category = library.getCategory();
-	    if (category == null) {
-		category = "Uncategorized"; //$NON-NLS-1$
-	    }
-
-	    Set<String> categoryLibs = this.categories.get(category);
-	    if (categoryLibs == null) {
-		categoryLibs = new HashSet<>();
-		this.categories.put(category, categoryLibs);
-	    }
-	    categoryLibs.add(name);
-
-	    Library current = this.latestLibs.get(name);
-	    if (current != null) {
-		if (Manager.compareVersions(library.getVersion(), current.getVersion()) > 0) {
-		    this.latestLibs.put(name, library);
+	private List<Library> libraries;
+
+	// category name to library name
+	private Map<String, Set<String>> categories = new HashMap<>();
+	
+	// library name to latest version of library
+	private Map<String, Library> latestLibs = new HashMap<>();
+
+	public void resolve() {
+		for (Library library : this.libraries) {
+			String name = library.getName();
+
+			String category = library.getCategory();
+			if (category == null) {
+				category = "Uncategorized"; //$NON-NLS-1$
+			}
+
+			Set<String> categoryLibs = this.categories.get(category);
+			if (categoryLibs == null) {
+				categoryLibs = new HashSet<>();
+				this.categories.put(category, categoryLibs);
+			}
+			categoryLibs.add(name);
+
+			Library current = this.latestLibs.get(name);
+			if (current != null) {
+				if (Manager.compareVersions(library.getVersion(), current.getVersion()) > 0) {
+					this.latestLibs.put(name, library);
+				}
+			} else {
+				this.latestLibs.put(name, library);
+			}
 		}
-	    } else {
-		this.latestLibs.put(name, library);
-	    }
 	}
-    }
 
-    public Library getLatestLibrary(String name) {
-	return this.latestLibs.get(name);
-    }
-
-    public Library getLibrary(String libName, String version) {
-	for (Library library : this.libraries) {
-	    if (library.getName().equals(libName) && (library.getVersion().equals(version))) {
-		return library;
-	    }
-	}
-	return null;
-    }
-
-    public Library getInstalledLibrary(String libName) {
-	for (Library library : this.libraries) {
-	    if (library.getName().equals(libName) && library.isInstalled()) {
-		return library;
-	    }
+	public Library getLatestLibrary(String name) {
+		return this.latestLibs.get(name);
 	}
-	return null;
-    }
 
-    public Set<String> getCategories() {
-	return this.categories.keySet();
-    }
+	public Library getLibrary(String libName, String version) {
+		for (Library library : this.libraries) {
+			if (library.getName().equals(libName) && (library.getVersion().equals(version))) {
+				return library;
+			}
+		}
+		return null;
+	}
 
-    public Collection<Library> getLatestLibraries(String category) {
-	Set<String> categoryLibs = this.categories.get(category);
-	if (categoryLibs == null) {
-	    return new ArrayList<>(0);
+	public Library getInstalledLibrary(String libName) {
+		for (Library library : this.libraries) {
+			if (library.getName().equals(libName) && library.isInstalled()) {
+				return library;
+			}
+		}
+		return null;
 	}
 
-	List<Library> libs = new ArrayList<>(categoryLibs.size());
-	for (String name : categoryLibs) {
-	    libs.add(this.latestLibs.get(name));
+	public Set<String> getCategories() {
+		return this.categories.keySet();
 	}
-	return libs;
-    }
 
-    public Collection<Library> getLibraries(String category) {
-	Set<String> categoryLibs = this.categories.get(category);
-	if (categoryLibs == null) {
-	    return new ArrayList<>(0);
+	public Collection<Library> getLatestLibraries(String category) {
+		Set<String> categoryLibs = this.categories.get(category);
+		if (categoryLibs == null) {
+			return new ArrayList<>(0);
+		}
+
+		List<Library> libs = new ArrayList<>(categoryLibs.size());
+		for (String name : categoryLibs) {
+			libs.add(this.latestLibs.get(name));
+		}
+		return libs;
 	}
 
-	List<Library> libs = new ArrayList<>(categoryLibs.size());
-	for (Library curLibrary : this.libraries) {
-	    if (categoryLibs.contains(curLibrary.getName())) {
-		libs.add(curLibrary);
-	    }
+	public Collection<Library> getLibraries(String category) {
+		Set<String> categoryLibs = this.categories.get(category);
+		if (categoryLibs == null) {
+			return new ArrayList<>(0);
+		}
+
+		List<Library> libs = new ArrayList<>(categoryLibs.size());
+		for (Library curLibrary : this.libraries) {
+			if (categoryLibs.contains(curLibrary.getName())) {
+				libs.add(curLibrary);
+			}
+		}
+		return libs;
 	}
-	return libs;
-    }
 
 }