From cbcbc5c4d50ff7fbb5f9ba0b291a8a9a6019022a Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Sun, 7 Jun 2009 11:28:53 +0000
Subject: [PATCH] Removing extra nested "examples" menu.

---
 app/src/processing/app/Base.java | 22 ++++++++++++++--------
 todo.txt                         |  6 +-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 15c4c0531..cb4453577 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -1074,14 +1074,20 @@ public class Base {
         ifound = true;
 
       } else {
-        // not a sketch folder, but maybe a subfolder containing sketches
-        JMenu submenu = new JMenu(list[i]);
-        // needs to be separate var
-        // otherwise would set ifound to false
-        boolean found = addSketches(submenu, subfolder, openReplaces); //, false);
-        if (found) {
-          menu.add(submenu);
-          ifound = true;
+        // don't create an extra menu level for a folder named "examples"
+        if (subfolder.getName().equals("examples")) {
+          boolean found = addSketches(menu, subfolder, openReplaces); //, false);
+          if (found) ifound = true;
+        } else {
+          // not a sketch folder, but maybe a subfolder containing sketches
+          JMenu submenu = new JMenu(list[i]);
+          // needs to be separate var
+          // otherwise would set ifound to false
+          boolean found = addSketches(submenu, subfolder, openReplaces); //, false);
+          if (found) {
+            menu.add(submenu);
+            ifound = true;
+          }
         }
       }
     }
diff --git a/todo.txt b/todo.txt
index 713753c98..a7a51ca71 100644
--- a/todo.txt
+++ b/todo.txt
@@ -3,13 +3,9 @@
 
 PROCESSING 5503 SYNC
 
-Move library examples from the library folders into the example folder.
-
-Don't explicitly add the built-in or user library examples to the examples menu.  Instead, the built-in library examples will be in the examples folder, and the user-library examples will appear in the sketchbook menu.
-
 Add library keyword highlighting.
 
-Test the dist.sh.  (Revise the disk image and include the drivers.)
+Test the FTDI drivers in the arduino.dmg.
 
 Update reference.