Add libraries from the original project to the sloeber converted project

Author: jan

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

@@ -37,6 +37,7 @@
 import io.sloeber.arduinoFramework.api.BoardDescription;
 import io.sloeber.arduinoFramework.api.IArduinoLibraryVersion;
 import io.sloeber.arduinoFramework.api.LibraryManager;
+import io.sloeber.arduinoFramework.internal.ArduinoLibraryVersion;
 import io.sloeber.autoBuild.api.AutoBuildProject;
 import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
 import io.sloeber.autoBuild.buildTools.api.IBuildTools;
@@ -48,6 +49,8 @@
 import io.sloeber.autoBuild.schema.api.IProjectType;
 import io.sloeber.core.Activator;
 import io.sloeber.core.Messages;
+import io.sloeber.core.internal.ArduinoHardwareLibrary;
+import io.sloeber.core.internal.ArduinoPrivateLibraryVersion;
 import io.sloeber.core.internal.SloeberConfiguration;
 import io.sloeber.core.listeners.IndexerController;
 import io.sloeber.core.natures.SloeberNature;
@@ -134,7 +137,7 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
 
 				// Get the libraries used
 				Set<String> libNames = new HashSet<>();
-				IFolder libFolder = OldCoreFolder.getFolder("libraries"); //$NON-NLS-1$
+				IFolder libFolder = project.getFolder("libraries"); //$NON-NLS-1$
 				if (libFolder.exists()) {
 					for (IResource curResource : libFolder.members()) {
 						if (curResource instanceof IFolder) {
@@ -210,18 +213,41 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
 					SloeberConfiguration sloeberConfiguration = new SloeberConfiguration(boardDescriptor, otherDesc,
 							compileDescriptor);
 
+
+
+					//Save the sloeber configuration in the autoBuild configuration
+					autoConf.setAutoBuildConfigurationExtensionDescription(sloeberConfiguration);
+
 					// Add the libraries
 					TreeMap<String, IArduinoLibraryVersion> availableLibs = LibraryManager
 							.getLibrariesAll(boardDescriptor);
 					// find the libs we can add
 					Set<IArduinoLibraryVersion> toInstallLibs = new HashSet<>();
 					for (String curLibName : libNames) {
-						toInstallLibs.add(availableLibs.get(curLibName));
+						IPath boardLibFQN = ArduinoHardwareLibrary.calculateFQN(curLibName);
+						IArduinoLibraryVersion foundLib = availableLibs.get(boardLibFQN.toString());
+						if (foundLib != null) {
+							toInstallLibs.add(foundLib);
+							continue;
+						}
+
+						IPath managedLibFQN = ArduinoLibraryVersion.calculateFQN(curLibName);
+						foundLib = availableLibs.get(managedLibFQN.toString());
+						if (foundLib != null) {
+							toInstallLibs.add(foundLib);
+							continue;
+						}
+
+						IPath privateLibFQN = ArduinoPrivateLibraryVersion.calculateFQN(curLibName);
+						foundLib = availableLibs.get(privateLibFQN.toString());
+						if (foundLib != null) {
+							toInstallLibs.add(foundLib);
+							continue;
+						}
+
 					}
+					toInstallLibs.remove(null);
 					sloeberConfiguration.addLibraries(toInstallLibs);
-
-					//Save the sloeber configuration in the autoBuild configuration
-					autoConf.setAutoBuildConfigurationExtensionDescription(sloeberConfiguration);
 				}
 
 				SubMonitor refreshMonitor = SubMonitor.convert(internalMonitor, 3);

io.sloeber.core/src/io/sloeber/core/internal/ArduinoHardwareLibrary.java

@@ -21,7 +21,7 @@ public class ArduinoHardwareLibrary implements IArduinoLibraryVersion {
 	public ArduinoHardwareLibrary(IPath installPath) {
 		myInstallPath = installPath;
 		myName = myInstallPath.lastSegment();
-		calculateFQN();
+		myFQN=calculateFQN(getName());
 	}
 
 	public ArduinoHardwareLibrary(String curSaveString, BoardDescription boardDesc) {
@@ -31,7 +31,7 @@ public ArduinoHardwareLibrary(String curSaveString, BoardDescription boardDesc)
 		if(!myInstallPath.toFile().exists()) {
 			myInstallPath=boardDesc.getReferencedCoreLibraryPath().append(myName);
 		}
-		calculateFQN();
+		myFQN=calculateFQN(getName());
 	}
 
 	@Override
@@ -64,9 +64,8 @@ public IPath getExamplePath() {
 	}
 
 
-	private void calculateFQN() {
-		myFQN=  Path.fromPortableString(SLOEBER_LIBRARY_FQN);
-		myFQN= myFQN.append(BOARD).append(getName());
+	public static IPath calculateFQN(String libName) {
+		return  Path.fromPortableString(SLOEBER_LIBRARY_FQN).append(BOARD).append(libName);
 	}
 
 	@Override

io.sloeber.core/src/io/sloeber/core/internal/ArduinoPrivateLibraryVersion.java

@@ -20,13 +20,13 @@ public class ArduinoPrivateLibraryVersion implements IArduinoLibraryVersion {
 	public ArduinoPrivateLibraryVersion(IPath installPath) {
 		myInstallPath = installPath;
 		myName = myInstallPath.lastSegment();
-		calcFQN();
+		myFQN= calculateFQN(getName());
 	}
 
 	public ArduinoPrivateLibraryVersion(String curSaveString) {
 		String[] parts=curSaveString.split(SEMI_COLON);
 		myName=parts[parts.length-1];
-		calcFQN();
+		myFQN= calculateFQN(getName());
 		String privateLibPaths[] = InstancePreferences.getPrivateLibraryPaths();
 		for (String curLibPath : privateLibPaths) {
 			Path curPrivPath=new Path(curLibPath);
@@ -67,9 +67,8 @@ public IPath getExamplePath() {
 		return getInstallPath().append(EXAMPLES_FOLDER);
 	}
 
-	private void calcFQN() {
-		myFQN=  Path.fromPortableString(SLOEBER_LIBRARY_FQN);
-		myFQN= myFQN.append(PRIVATE).append(getName());
+	static public IPath calculateFQN(String libName) {
+		return  Path.fromPortableString(SLOEBER_LIBRARY_FQN).append(PRIVATE).append(libName);
 	}
 
 	@Override