Bug in SoftwareSerial when using inverse logic

.gitignore

@@ -19,3 +19,6 @@ build/linux/dist/*.tar.gz
 build/linux/*.tgz
 test-bin
 *.iml
+build/windows/launch4j-*
+build/windows/launcher/launch4j
+build/windows/WinAVR-*.zip

README.md

@@ -0,0 +1,44 @@
+Arduino
+========
+
+* Arduino is an open-source physical computing platform based on a simple i/o
+board and a development environment that implements the Processing/Wiring
+language. Arduino can be used to develop stand-alone interactive objects or
+can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
+The boards can be assembled by hand or purchased preassembled; the open-source
+IDE can be downloaded for free.
+
+* For more information, see the website at: http://www.arduino.cc/
+or the forums at: http://arduino.cc/forum/
+
+* To report a *bug* in the software or to request *a simple enhancement* go to:
+http://github.com/arduino/Arduino/issues
+
+* More complex requests and technical discussion should go on the Arduino Developers
+mailing list:
+https://groups.google.com/a/arduino.cc/forum/#!forum/developers
+
+* If you're interested in modifying or extending the Arduino software, we strongly 
+suggest discussing your ideas on the Developers mailing list *before* starting
+to work on them. That way you can coordinate with the Arduino Team and others,
+giving your work a higher chance of being integrated into the official release
+https://groups.google.com/a/arduino.cc/forum/#!forum/developers
+
+Installation
+------------
+Detailed instructions are in reference/Guide_Windows.html and
+reference/Guide_MacOSX.html.  For Linux, see the Arduino playground:
+http://www.arduino.cc/playground/Learning/Linux
+
+Credits
+--------
+Arduino is an open source project, supported by many.
+
+The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,
+Gianluca Martino, Daniela Antonietti, and David A. Mellis.
+
+Arduino uses the [GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc), [avrdude](http://www.nongnu.org/avrdude/), [avr-libc](http://www.nongnu.org/avr-libc/), and code from
+[Processing](http://www.processing.org) and [Wiring](http://wiring.org.co).
+
+Icon and about image designed by [ToDo](http://www.todo.to.it/)
+

app/src/processing/app/Base.java

@@ -31,6 +31,9 @@
 
 import processing.app.debug.Compiler;
 import processing.app.debug.Target;
+import processing.app.helpers.FileUtils;
+import processing.app.helpers.filefilters.OnlyDirs;
+import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
 import processing.app.tools.ZipDeflater;
 import processing.core.*;
 import static processing.app.I18n._;
@@ -117,7 +120,7 @@ static public void main(String args[]) {
       File versionFile = getContentFile("lib/version.txt");
       if (versionFile.exists()) {
         String version = PApplet.loadStrings(versionFile)[0];
-        if (!version.equals(VERSION_NAME)) {
+        if (!version.equals(VERSION_NAME) && !version.equals("${version}")) {
           VERSION_NAME = version;
           RELEASE = true;
         }
@@ -126,6 +129,10 @@ static public void main(String args[]) {
       e.printStackTrace();
     }
 
+    // help 3rd party installers find the correct hardware path
+    Preferences.set("last.ide." + VERSION_NAME + ".hardwarepath", getHardwarePath());
+    Preferences.set("last.ide." + VERSION_NAME + ".daterun", "" + (new Date()).getTime() / 1000);
+
 //    if (System.getProperty("mrj.version") != null) {
 //      //String jv = System.getProperty("java.version");
 //      String ov = System.getProperty("os.version");
@@ -949,9 +956,10 @@ public void rebuildImportMenu(JMenu importMenu, final Editor editor) {
     JMenuItem addLibraryMenuItem = new JMenuItem(_("Add Library..."));
     addLibraryMenuItem.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
-        Base.this.handleAddZipLibrary(editor);
+        Base.this.handleAddLibrary(editor);
         Base.this.onBoardOrPortChange();
         Base.this.rebuildImportMenu(Editor.importMenu, editor);
+        Base.this.rebuildExamplesMenu(Editor.examplesMenu);
       }
     });
     importMenu.add(addLibraryMenuItem);
@@ -1203,62 +1211,51 @@ public void actionPerformed(ActionEvent event) {
     boolean ifound = false;
 
     for (String potentialName : list) {
-      File subfolder = new File(folder, potentialName);
-//      File libraryFolder = new File(subfolder, "library");
-//      File libraryJar = new File(libraryFolder, potentialName + ".jar");
-//      // If a .jar file of the same prefix as the folder exists
-//      // inside the 'library' subfolder of the sketch
-//      if (libraryJar.exists()) {
-        String sanityCheck = Sketch.sanitizeName(potentialName);
-        if (!sanityCheck.equals(potentialName)) {
-          String mess = I18n.format(
-            _("The library \"{0}\" cannot be used.\n" +
-              "Library names must contain only basic letters and numbers.\n" +
-              "(ASCII only and no spaces, and it cannot start with a number)"),
-	    potentialName
-	  );
-          Base.showMessage(_("Ignoring bad library name"), mess);
-          continue;
-        }
+      File libFolder = new File(folder, potentialName);
+      String sanityCheck = Sketch.sanitizeName(potentialName);
+      if (!sanityCheck.equals(potentialName)) {
+        String mess = I18n.format(_("The library \"{0}\" cannot be used.\n"
+            + "Library names must contain only basic letters and numbers.\n"
+            + "(ASCII only and no spaces, and it cannot start with a number)"),
+            potentialName);
+        Base.showMessage(_("Ignoring bad library name"), mess);
+        continue;
+      }
 
-        String libraryName = potentialName;
-//        // get the path for all .jar files in this code folder
-//        String libraryClassPath =
-//          Compiler.contentsToClassPath(libraryFolder);
-//        // grab all jars and classes from this folder,
-//        // and append them to the library classpath
-//        librariesClassPath +=
-//          File.pathSeparatorChar + libraryClassPath;
-//        // need to associate each import with a library folder
-//        String packages[] =
-//          Compiler.packageListFromClassPath(libraryClassPath);
-        libraries.add(subfolder);
+      String libraryName = potentialName;
+      libraries.add(libFolder);
+      String libFolderPath = libFolder.getAbsolutePath();
       try {
-        String packages[] =
-          Compiler.headerListFromIncludePath(subfolder.getAbsolutePath());
-        for (String pkg : packages) {
-          importToLibraryTable.put(pkg, subfolder);
+        String headers[] = Compiler.headerListFromIncludePath(libFolderPath);
+        for (String header : headers) {
+          // Extract file name (without extension ".h")
+          String name = header.substring(0, header.length() - 2);
+
+          // If the header name equals to the current library folder use it
+          if (libFolderPath.endsWith(name)) {
+            importToLibraryTable.put(header, libFolder);
+            continue;
+          }
+
+          // If a library was already found with this header, keep it if
+          // the library's directory name matches the header name.
+          File old = importToLibraryTable.get(header);
+          if (old != null) {
+            if (old.getPath().endsWith(name))
+              continue;
+          }
+          importToLibraryTable.put(header, libFolder);
         }
       } catch (IOException e) {
-        showWarning(_("Error"), I18n.format("Unable to list header files in {0}", subfolder), e);
+        showWarning(_("Error"), I18n.format(
+            "Unable to list header files in {0}", libFolder), e);
       }
 
-        JMenuItem item = new JMenuItem(libraryName);
-        item.addActionListener(listener);
-        item.setActionCommand(subfolder.getAbsolutePath());
-        menu.add(item);
-        ifound = true;
-
-// XXX: DAM: should recurse here so that library folders can be nested
-//      } else {  // not a library, but is still a folder, so recurse
-//        JMenu submenu = new JMenu(libraryName);
-//        // needs to be separate var, otherwise would set ifound to false
-//        boolean found = addLibraries(submenu, subfolder);
-//        if (found) {
-//          menu.add(submenu);
-//          ifound = true;
-//        }
-//      }
+      JMenuItem item = new JMenuItem(libraryName);
+      item.addActionListener(listener);
+      item.setActionCommand(libFolderPath);
+      menu.add(item);
+      ifound = true;
     }
     return ifound;
   }
@@ -2374,24 +2371,70 @@ static protected void listFiles(String basePath,
     }
   }
 
+  public void handleAddLibrary(Editor editor) {
+    JFileChooser fileChooser = new JFileChooser(System.getProperty("user.home"));
+    fileChooser.setDialogTitle(_("Select a zip file or a folder containing the library you'd like to add"));
+    fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+    fileChooser.setFileFilter(new FileNameExtensionFilter(_("ZIP files or folders"), "zip"));
 
-  public void handleAddZipLibrary(Editor editor) {
-    String prompt = _("Select a zip file containing the library you'd like to add");
-    FileDialog fd = new FileDialog(editor, prompt, FileDialog.LOAD);
-    fd.setDirectory(System.getProperty("user.home"));
-    fd.setVisible(true);
+    Dimension preferredSize = fileChooser.getPreferredSize();
+    fileChooser.setPreferredSize(new Dimension(preferredSize.width + 200, preferredSize.height + 200));
 
-    String directory = fd.getDirectory();
-    String filename = fd.getFile();
-    if (filename == null) return;
+    int returnVal = fileChooser.showOpenDialog(editor);
+
+    if (returnVal != JFileChooser.APPROVE_OPTION) {
+      return;
+    }
+
+    File sourceFile = fileChooser.getSelectedFile();
+    File tmpFolder = null;
 
-    File sourceFile = new File(directory, filename);
     try {
-      ZipDeflater zipDeflater = new ZipDeflater(sourceFile, getSketchbookLibrariesFolder());
-      zipDeflater.deflate();
+      // unpack ZIP
+      if (!sourceFile.isDirectory()) {
+        try {
+          tmpFolder = FileUtils.createTempFolder();
+          ZipDeflater zipDeflater = new ZipDeflater(sourceFile, tmpFolder);
+          zipDeflater.deflate();
+          File[] foldersInTmpFolder = tmpFolder.listFiles(new OnlyDirs());
+          if (foldersInTmpFolder.length != 1) {
+            throw new IOException(_("Zip doesn't contain a library"));
+          }
+          sourceFile = foldersInTmpFolder[0];
+        } catch (IOException e) {
+          editor.statusError(e);
+          return;
+        }
+      }
+
+      // is there a valid library?
+      File libFolder = sourceFile;
+      String libName = libFolder.getName();
+      if (!Sketch.isSanitaryName(libName)) {
+        String mess = I18n.format(_("The library \"{0}\" cannot be used.\n"
+            + "Library names must contain only basic letters and numbers.\n"
+            + "(ASCII only and no spaces, and it cannot start with a number)"),
+                                  libName);
+        editor.statusError(mess);
+        return;
+      }
+
+      // copy folder
+      File destinationFolder = new File(getSketchbookLibrariesFolder(), sourceFile.getName());
+      if (!destinationFolder.mkdir()) {
+        editor.statusError(I18n.format(_("A library named {0} already exists"), sourceFile.getName()));
+        return;
+      }
+      try {
+        FileUtils.copy(sourceFile, destinationFolder);
+      } catch (IOException e) {
+        editor.statusError(e);
+        return;
+      }
       editor.statusNotice(_("Library added to your libraries. Check \"Import library\" menu"));
-    } catch (IOException e) {
-      editor.statusError(e);      
+    } finally {
+      // delete zip created temp folder, if exists
+      FileUtils.recursiveDelete(tmpFolder);
     }
   }
 }

app/src/processing/app/Editor.java

@@ -177,7 +177,7 @@ public void windowActivated(WindowEvent e) {
           // re-add the sub-menus that are shared by all windows
           fileMenu.insert(sketchbookMenu, 2);
           fileMenu.insert(examplesMenu, 3);
-          //sketchMenu.insert(importMenu, 4);
+          sketchMenu.insert(importMenu, 4);
           toolsMenu.insert(boardsMenu, numTools);
           toolsMenu.insert(serialMenu, numTools + 1);
         }
@@ -188,7 +188,7 @@ public void windowDeactivated(WindowEvent e) {
 //          System.err.println("deactivate");  // not coming through
           fileMenu.remove(sketchbookMenu);
           fileMenu.remove(examplesMenu);
-          //sketchMenu.remove(importMenu);
+          sketchMenu.remove(importMenu);
           toolsMenu.remove(boardsMenu);
           toolsMenu.remove(serialMenu);
         }
@@ -430,6 +430,8 @@ protected void applyPreferences() {
     textarea.setEditable(!external);
     saveMenuItem.setEnabled(!external);
     saveAsMenuItem.setEnabled(!external);
+
+    textarea.setDisplayLineNumbers(Preferences.getBoolean("editor.linenumbers"));
 
     TextAreaPainter painter = textarea.getPainter();
     if (external) {