Merge pull request #729 from martinmikula/master

Fixed installation of defaults libraries after first run

Author: jantje

io.sloeber.core/src/io/sloeber/core/api/Defaults.java

@@ -12,7 +12,7 @@ public class Defaults {
 	public static final String PLATFORM_NAME = "Arduino AVR Boards";
 	public static final String[] INSTALLED_LIBRARIES = new String[] { "Ethernet", "Firmata", "GSM", "Keyboard",
 			"LiquidCrystal", "Mouse", "SD", "Servo", "Stepper", "TFT", "WiFi", "CapacitiveSensor" };
-	private static final String DEFAULT = "Default";
+	public static final String DEFAULT = "Default";
 
 	/**
 	 * Arduino has the default libraries in the user home directory in subfolder

io.sloeber.core/src/io/sloeber/core/api/LibraryManager.java

@@ -142,7 +142,7 @@ public LibraryTree() {
 									.append(library.getArchitectures().toString()).append("\n\n") //$NON-NLS-1$
 									.append(library.getSentence());
 							lib = new Library(category, library.getName(), libraryIndex.getName(), builder.toString());
-							category.libraries.put(library.getName() + " (" + libraryIndex.getName() + ")", lib); //$NON-NLS-1$ //$NON-NLS-2$
+							category.libraries.put(library.getName() + " (" + libraryIndex.getName() + ")", lib);  //$NON-NLS-1$//$NON-NLS-2$
 						}
 						lib.versions.add(new VersionNumber(library.getVersion()));
 						if (library.isInstalled()) {

io.sloeber.core/src/io/sloeber/core/managers/LibraryIndex.java

@@ -10,6 +10,8 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import io.sloeber.core.api.Defaults;
+
 public class LibraryIndex {
 	private String indexName;
 	private List<Library> libraries;
@@ -104,7 +106,7 @@ public Collection<Library> getLibraries(String category) {
 	public void setJsonFile(File packageFile) {
 		String fileName = packageFile.getName().toLowerCase();
 		if (fileName.matches("(?i)library_index.json")) { //$NON-NLS-1$
-			this.indexName = "Default"; //$NON-NLS-1$
+			this.indexName = Defaults.DEFAULT;
 		} else {
 			this.indexName = fileName.replaceAll("(?i)" + Pattern.quote("library_"), "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 					.replaceAll("(?i)" + Pattern.quote("_index.json"), ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

io.sloeber.core/src/io/sloeber/core/managers/Manager.java

@@ -90,7 +90,7 @@ public static void startup_Pluging(IProgressMonitor monitor) {
 		loadJsons(ConfigurationPreferences.getUpdateJasonFilesFlag());
 		List<Board> allBoards = getInstalledBoards();
 		if (allBoards.isEmpty()) { // If boards are installed do nothing
-			// InstallDefaultLibraries(monitor);
+			InstallDefaultLibraries(monitor);
 			MyMultiStatus mstatus = new MyMultiStatus("Failed to configer Sloeber"); //$NON-NLS-1$
 
 			// Downnload sample programs
@@ -123,14 +123,18 @@ public static void startup_Pluging(IProgressMonitor monitor) {
 
 	}
 
-	/*
-	 * private static void InstallDefaultLibraries(IProgressMonitor monitor) {
-	 * LibraryIndex libindex = getLibraryIndex();
-	 *
-	 * for (String library : Defaults.INSTALLED_LIBRARIES) { Library toInstalLib
-	 * = libindex.getLatestLibrary(library); if (toInstalLib != null) {
-	 * toInstalLib.install(monitor); } } }
-	 */
+	private static void InstallDefaultLibraries(IProgressMonitor monitor) {
+		LibraryIndex libindex = getLibraryIndex(Defaults.DEFAULT);
+		if (libindex == null)
+			return;
+
+		for (String library : Defaults.INSTALLED_LIBRARIES) {
+			Library toInstalLib = libindex.getLatestLibrary(library);
+			if (toInstalLib != null) {
+				toInstalLib.install(monitor);
+			}
+		}
+	}
 
 	/**
 	 * Given a platform description in a json file download and install all
@@ -230,9 +234,9 @@ static private void loadJson(String url, boolean forceDownload) {
 			}
 		}
 		if (jsonFile.exists()) {
-			if (jsonFile.getName().startsWith("package_")) { //$NON-NLS-1$
+			if (jsonFile.getName().toLowerCase().startsWith("package_")) { //$NON-NLS-1$
 				loadPackage(jsonFile);
-			} else if (jsonFile.getName().startsWith("library_")) { //$NON-NLS-1$
+			} else if (jsonFile.getName().toLowerCase().startsWith("library_")) { //$NON-NLS-1$
 				loadLibrary(jsonFile);
 			}
 		}
@@ -255,7 +259,6 @@ static private void loadLibrary(File jsonFile) {
 		try (Reader reader = new FileReader(jsonFile)) {
 			LibraryIndex index = new Gson().fromJson(reader, LibraryIndex.class);
 			index.resolve();
-			// index.setOwners(null);
 			index.setJsonFile(jsonFile);
 			libraryIndices.add(index);
 		} catch (Exception e) {
@@ -278,6 +281,15 @@ static public List<LibraryIndex> getLibraryIndices() {
 		}
 		return libraryIndices;
 	}
+	
+	static public LibraryIndex getLibraryIndex(String name) {
+		for (LibraryIndex index : getLibraryIndices()) {
+			if (index.getName().equals(name)) {
+				return index;
+			}
+		}
+		return null;
+	}
 
 	static public Board getBoard(String boardName, String platformName, String packageName) {
 		for (PackageIndex index : getPackageIndices()) {
@@ -772,7 +784,7 @@ public static int compareVersions(String version1, String version2) {
 				if (vi1 > vi2) {
 					return 1;
 				}
-			} catch (NumberFormatException e) {
+			} catch (@SuppressWarnings("unused") NumberFormatException e) {
 				// not numbers, do string compares
 				int c = v1[i].compareTo(v2[i]);
 				if (c < 0) {