Removed the, now useless, library folder handling

Author: cmaglie

app/src/processing/app/Base.java

@@ -32,7 +32,6 @@
 import cc.arduino.contributions.libraries.LibrariesIndexer;
 import cc.arduino.contributions.libraries.LibraryInstaller;
 import cc.arduino.contributions.libraries.LibraryOfSameTypeComparator;
-import cc.arduino.contributions.libraries.LibraryTypeComparator;
 import cc.arduino.contributions.libraries.ui.LibraryManagerUI;
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.contributions.packages.ContributionInstaller;
@@ -364,7 +363,6 @@ public Base(String[] args) throws Exception {
 
       LibrariesIndexer indexer = new LibrariesIndexer(BaseNoGui.getArduinoCoreService());
       indexer.regenerateIndex();
-      indexer.setLibrariesFolders(BaseNoGui.getLibrariesFolders());
       indexer.rescanLibraries();
 
       for (String libraryArg : parser.getLibraryToInstall().split(",")) {

arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java

@@ -49,15 +49,13 @@
 import processing.app.helpers.FileUtils;
 import processing.app.packages.LibraryList;
 import processing.app.packages.UserLibrary;
-import processing.app.packages.UserLibraryFolder;
 import processing.app.packages.UserLibraryFolder.Location;
 import processing.app.packages.UserLibraryPriorityComparator;
 
 public class LibrariesIndexer {
 
   private LibrariesIndex index;
   private final LibraryList installedLibraries = new LibraryList();
-  private List<UserLibraryFolder> librariesFolders;
 
   private ArduinoCoreInstance core;
 
@@ -103,15 +101,6 @@ public void regenerateIndex() {
     rescanLibraries();
   }
 
-  public void setLibrariesFolders(List<UserLibraryFolder> folders) {
-    librariesFolders = folders;
-    rescanLibraries();
-  }
-
-  public List<UserLibraryFolder> getLibrariesFolders() {
-    return librariesFolders;
-  }
-
   private Comparator<UserLibrary> priorityComparator = new UserLibraryPriorityComparator(
       null);
 

arduino-core/src/processing/app/BaseNoGui.java

@@ -88,9 +88,6 @@ public class BaseNoGui {
   // maps #included files to their library folder
   public static Map<String, LibraryList> importToLibraryTable;
 
-  // XXX: Remove this field
-  static private List<UserLibraryFolder> librariesFolders;
-
   static UserNotifier notifier = new BasicUserNotifier();
 
   static public Map<String, TargetPackage> packages;
@@ -263,10 +260,6 @@ static public String getHardwarePath() {
     return getHardwareFolder().getAbsolutePath();
   }
 
-  static public List<UserLibraryFolder> getLibrariesFolders() {
-    return librariesFolders;
-  }
-
   static public Platform getPlatform() {
     return platform;
   }
@@ -656,37 +649,10 @@ public static boolean isIDEInstalledIntoSettingsFolder() {
   static public void onBoardOrPortChange() {
     examplesFolder = getContentFile("examples");
     toolsFolder = getContentFile("tools");
-    librariesFolders = new ArrayList<>();
-
-    // Add IDE libraries folder
-    librariesFolders.add(new UserLibraryFolder(getContentFile("libraries"), Location.IDE_BUILTIN));
-
-    TargetPlatform targetPlatform = getTargetPlatform();
-    if (targetPlatform != null) {
-      String core = getBoardPreferences().get("build.core", "arduino");
-      if (core.contains(":")) {
-        String referencedCore = core.split(":")[0];
-        TargetPlatform referencedPlatform = getTargetPlatform(referencedCore, targetPlatform.getId());
-        if (referencedPlatform != null) {
-          File referencedPlatformFolder = referencedPlatform.getFolder();
-          // Add libraries folder for the referenced platform
-          File folder = new File(referencedPlatformFolder, "libraries");
-          librariesFolders.add(new UserLibraryFolder(folder, Location.REFERENCED_CORE));
-        }
-      }
-      File platformFolder = targetPlatform.getFolder();
-      // Add libraries folder for the selected platform
-      File folder = new File(platformFolder, "libraries");
-      librariesFolders.add(new UserLibraryFolder(folder, Location.CORE));
-    }
-
-    // Add libraries folder for the sketchbook
-    librariesFolders.add(getSketchbookLibrariesFolder());
 
     // Scan for libraries in each library folder.
     // Libraries located in the latest folders on the list can override
     // other libraries with the same name.
-    librariesIndexer.setLibrariesFolders(librariesFolders);
     if (getTargetPlatform() != null) {
       librariesIndexer.setArchitecturePriority(getTargetPlatform().getId());
     }