get the libs back when reopening a project #1695

Author: jan

io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardDescription.java

@@ -676,7 +676,7 @@ public PlatformTxtFile getreferencedCorePlatformFile() {
 	public IPath getReferencedCoreLibraryPath() {
 		updateWhenDirty();
 		if (myReferencedPlatformCore == null) {
-			return null;
+			return getReferencingLibraryPath();
 		}
 		return this.myReferencedPlatformCore.getInstallPath().append(ARDUINO_LIBRARY_FOLDER_NAME);
 	}

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

@@ -455,17 +455,17 @@ private static Map<String, IArduinoLibraryVersion> getLibrariesHarware(BoardDesc
 	}
 
 	public static IArduinoLibraryVersion getLibraryVersionFromLocation(IFolder libFolder,BoardDescription boardDescriptor) {
-		// TODO Auto-generated method stub
-
 		if (boardDescriptor != null) {
 			IPath libPath=boardDescriptor.getReferencedCoreLibraryPath();
 			if(libPath!=null && libPath.isPrefixOf(libFolder.getLocation())) {
-				return getLibrariesHarware(boardDescriptor).get(libFolder.getName());
+				String FQNLibName=ArduinoHardwareLibrary.calculateFQN(libFolder.getName()).toString();
+				return getLibrariesHarware(boardDescriptor).get(FQNLibName);
 			}
 		}
 
 		if(ConfigurationPreferences.getInstallationPathLibraries().isPrefixOf(libFolder.getLocation())) {
-			return getLibrariesdManaged().get(libFolder.getName());
+			String FQNLibName= ArduinoLibraryVersion.calculateFQN(libFolder.getName()).toString();
+			return getLibrariesdManaged().get(FQNLibName);
 		}
 
 		return getLibrariesPrivate().get(libFolder.getName());

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

@@ -617,6 +617,11 @@ public void reAttachLibraries() {
 
 	@Override
 	public Map<String, IArduinoLibraryVersion> getUsedLibraries() {
+		try {
+			myLibraries=getLibrariesFromLinks();
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
 		return new HashMap<>(myLibraries);
 	}
 

io.sloeber.ui/src/io/sloeber/ui/Import_Libraries_Page.java

@@ -65,13 +65,17 @@ public void createControl(Composite parent) {
 	}
 
 	class ItemSorter {
-		public static ISloeberConfiguration sloeberCfg;
-		public TreeMap<String, ItemSorter> myItems = new TreeMap<>();
-		public IArduinoLibraryVersion myLib = null;
+		private TreeMap<String, ItemSorter> myItems = new TreeMap<>();
+		private IArduinoLibraryVersion myLib = null;
+		private static Map<String, IArduinoLibraryVersion> myCurrentInstalledLibs =null;
 
 		ItemSorter() {
 		}
 
+		static void SetSloeberConfiguration(ISloeberConfiguration sloeberCfg) {
+				myCurrentInstalledLibs = sloeberCfg.getUsedLibraries();
+		}
+
 		public void createChildren(TreeItem curItem) {
 			for (Entry<String, ItemSorter> curentry : myItems.entrySet()) {
 				String key = curentry.getKey();
@@ -83,7 +87,7 @@ public void createChildren(TreeItem curItem) {
 			if (myLib == null) {
 				curItem.setGrayed(true);
 			}else {
-				boolean isSelected = sloeberCfg.getUsedLibraries().get(myLib.getName()) != null;
+				boolean isSelected = myCurrentInstalledLibs.get(myLib.getName()) != null;
 				curItem.setChecked(isSelected);
 				curItem.setData(myLib);
 				if (isSelected) {
@@ -127,7 +131,7 @@ protected void createSourceGroup(Composite parent) {
 
 		// sort the items
 		ItemSorter sortedItems = new ItemSorter();
-		ItemSorter.sloeberCfg = sloeberCfg;
+		ItemSorter.SetSloeberConfiguration(sloeberCfg);
 
 		for (IArduinoLibraryVersion curlib : allLibraries.values()) {
 			String keys[] = curlib.getBreadCrumbs();