Make the library (examples) menu nested

Previously, the library scanning code started supported subfolders
inside the libraries folders. Now, the import library and library
examples menus also reflect this nested structure.

In addition to the on-disk nesting, this also shows a top-level
structure (which was already added by the scanning code), dividing the
libraries into "Libraries for all boards", "Libraries for Arduino AVR
Boards" (or whatever core is being used) and "Libraries from your
sketchbook".

app/src/processing/app/Base.java

@@ -1312,14 +1312,31 @@ public void rebuildExamplesMenu(JMenu menu) {
  if (libraries != null && !libraries.isEmpty()) {
  if (found)
  menu.addSeparator();
- for (Library lib : getLibraries())
- addSketchesSubmenu(menu, lib, false);
+ addLibraryExamples(menu, libraries);
  }
  } catch (IOException e) {
  e.printStackTrace();
  }
  }
 
+ protected void addLibraryExamples(JMenu menu, LibraryList libs) throws IOException {
+ // Add any subdirectories first
+ for (LibraryList sub : libs.getSubs()) {
+ if (sub.isEmpty())
+ continue;
+
+ JMenu submenu = new JMenu(sub.getName());
+ addLibraryExamples(submenu, sub);
+ menu.add(submenu);
+ MenuScroller.setScrollerFor(submenu);
+ }
+
+ // Then add the libraries directly in this folder
+ for (Library lib : libs.getLibs()) {
+ addSketchesSubmenu(menu, lib, false);
+ }
+ }
+
  public void updateLibraries() throws IOException {
  // Calculate paths for libraries and examples
  examplesFolder = getContentFile("examples");
@@ -1803,7 +1820,18 @@ public void actionPerformed(ActionEvent e) {
  }
 
  protected void addLibraries(JMenu menu, LibraryList libs) throws IOException {
- for (Library lib : libs.getAll()) {
+ // Add any subdirectories first
+ for (LibraryList sub : libs.getSubs()) {
+ if (sub.isEmpty())
+ continue;
+
+ JMenu submenu = new JMenu(sub.getName());
+ addLibraries(submenu, sub);
+ menu.add(submenu);
+ MenuScroller.setScrollerFor(submenu);
+ }
+ // Then add the libraries directly in this folder
+ for (Library lib : libs.getLibs()) {
  @SuppressWarnings("serial")
  AbstractAction action = new AbstractAction(lib.getName()) {
  public void actionPerformed(ActionEvent event) {
@@ -1821,8 +1849,6 @@ public void actionPerformed(ActionEvent event) {
  JMenuItem item = new JMenuItem(action);
  item.putClientProperty("library", lib);
  menu.add(item);
-
- // XXX: DAM: should recurse here so that library folders can be nested
  }
  }