fix call rescanLibraries() twice #10228

Author: ricardojlrufino

app/test/cc/arduino/contributions/UpdatableLibraryTest.java

@@ -36,8 +36,7 @@ public void testUpdatableLibrary() throws Exception {
     LibrariesIndexer indexer = new LibrariesIndexer(index_SD_only);
     BaseNoGui.librariesIndexer = indexer;
     indexer.parseIndex();
-    indexer.setLibrariesFolders(folders);
-    indexer.rescanLibraries();
+    indexer.setLibrariesFoldersAndRescan(folders);
 
     ContributedLibrary sdLib = indexer.getIndex().getInstalled("SD").get();
     assertTrue("SD lib is installed", sdLib.isLibraryInstalled());
@@ -46,8 +45,7 @@ public void testUpdatableLibrary() throws Exception {
     assertTrue(ContributionsSelfCheck.checkForUpdatableLibraries());
 
     folders.add(new UserLibraryFolder(SD121, Location.SKETCHBOOK));
-    indexer.setLibrariesFolders(folders);
-    indexer.rescanLibraries();
+    indexer.setLibrariesFoldersAndRescan(folders);
 
     sdLib = indexer.getIndex().getInstalled("SD").get();
     assertTrue("SD lib is installed", sdLib.isLibraryInstalled());
@@ -64,8 +62,7 @@ public void testUpdatableLibraryWithBundled() throws Exception {
     LibrariesIndexer indexer = new LibrariesIndexer(index_Bridge_only);
     BaseNoGui.librariesIndexer = indexer;
     indexer.parseIndex();
-    indexer.setLibrariesFolders(folders);
-    indexer.rescanLibraries();
+    indexer.setLibrariesFoldersAndRescan(folders);
 
     ContributedLibrary l = indexer.getIndex().getInstalled("Bridge").get();
     assertTrue("Bridge lib is installed", l.isLibraryInstalled());
@@ -74,8 +71,7 @@ public void testUpdatableLibraryWithBundled() throws Exception {
     assertTrue(ContributionsSelfCheck.checkForUpdatableLibraries());
 
     folders.add(new UserLibraryFolder(Bridge170, Location.SKETCHBOOK));
-    indexer.setLibrariesFolders(folders);
-    indexer.rescanLibraries();
+    indexer.setLibrariesFoldersAndRescan(folders);
 
     l = indexer.getIndex().getInstalled("Bridge").get();
     assertTrue("Bridge lib is installed", l.isLibraryInstalled());

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

@@ -113,14 +113,14 @@ private void parseIndex(File file) throws IOException {
     }
   }
 
-  public void setLibrariesFolders(List<UserLibraryFolder> folders) {
-      setLibrariesFolders(folders, false);
+  public void setLibrariesFolders( List<UserLibraryFolder> folders ) {
+      this.librariesFolders = folders;
   }
 
-  public void setLibrariesFolders(List<UserLibraryFolder> folders, boolean rescan) {
-      librariesFolders = folders;
-      if(rescan) rescanLibraries();
-    }
+  public void setLibrariesFoldersAndRescan( List<UserLibraryFolder> folders ) {
+      setLibrariesFolders(folders);
+      rescanLibraries();
+  }
 
   public List<UserLibraryFolder> getLibrariesFolders() {
     return librariesFolders;