Manual merge ide.1.5.x

Author: Federico Fissore

.gitignore

@@ -18,6 +18,9 @@ build/windows/jre.zip
 build/windows/libastylej*
 build/windows/arduino-*.zip
 build/windows/dist/gcc-*.tar.gz
+build/windows/launch4j-*
+build/windows/launcher/launch4j
+build/windows/WinAVR-*.zip
 build/macosx/arduino-*.zip
 build/macosx/dist/gcc-*.tar.gz
 build/macosx/libastylej*
@@ -31,3 +34,4 @@ test-bin
 .DS_Store
 hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
 avr-toolchain-*.zip
+

app/src/cc/arduino/packages/Uploader.java

@@ -20,8 +20,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
-  $Id$
 */
 
 package cc.arduino.packages;

app/src/cc/arduino/packages/discoverers/SerialDiscovery.java

@@ -29,15 +29,15 @@
 
 package cc.arduino.packages.discoverers;
 
-import cc.arduino.packages.BoardPort;
-import cc.arduino.packages.Discovery;
-import jssc.SerialPortList;
+import java.util.ArrayList;
+import java.util.List;
+
 import processing.app.Base;
 import processing.app.Platform;
+import processing.app.Serial;
 import processing.app.helpers.PreferencesMap;
-
-import java.util.ArrayList;
-import java.util.List;
+import cc.arduino.packages.BoardPort;
+import cc.arduino.packages.Discovery;
 
 public class SerialDiscovery implements Discovery {
 
@@ -48,7 +48,7 @@ public List<BoardPort> discovery() {
 
     List<BoardPort> res = new ArrayList<BoardPort>();
 
-    String[] ports = SerialPortList.getPortNames();
+    List<String> ports = Serial.list();
 
     for (String port : ports) {
       String boardName = os.resolveDeviceAttachedTo(port, Base.packages, devicesListOutput);

app/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -22,8 +22,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
-  $Id$
 */
 
 package cc.arduino.packages.uploaders;

app/src/processing/app/Base.java

@@ -61,9 +61,9 @@
  * files and images, etc) that comes from that.
  */
 public class Base {
-  public static final int REVISION = 155;
+  public static final int REVISION = 156;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static String VERSION_NAME = "0155";
+  static String VERSION_NAME = "0156";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 

app/src/processing/app/Preferences.java

@@ -93,6 +93,7 @@ public String toString() {
 
   Language languages[] = {
       new Language(_("System Default"), "", ""),
+      new Language(_("Albanian"), "shqip", "sq"),
       new Language(_("Arabic"), "العربية", "ar"),
       new Language(_("Aragonese"), "Aragonés", "an"),
       new Language(_("Belarusian"), "Беларуская мова", "be"),
@@ -145,6 +146,7 @@ public String toString() {
   Language missingLanguages[] = {
       new Language(_("Armenian"), "Հայերեն", "hy"),
       new Language(_("Asturian"), "Asturianu", "ast"),
+      new Language(_("Basque"), "Euskara", "eu"),
       new Language(_("Bosnian"), "Bosanski", "bs"),
       new Language(_("Burmese (Myanmar)"), "ဗမာစကား", "my_MM"),
       new Language(_("Chinese (China)"), "", "zh_CN"),
@@ -153,8 +155,10 @@ public String toString() {
       new Language(_("Chinese (Taiwan) (Big5)"), "", "zh_TW.Big5"),
       new Language(_("Dutch (Netherlands)"), "Nederlands", "nl_NL"),
       new Language(_("Nepali"), "नेपाली", "ne"),
+      new Language(_("N'Ko"), "ߒߞߏ", "nqo"),
       new Language(_("Marathi"), "मराठी", "mr"),
       new Language(_("Portugese"), "Português", "pt"),
+      new Language(_("Persian (Iran)"), "فارسی (Iran)", "fa_IR"),
       };
 
   /**

app/src/processing/app/Serial.java

@@ -24,14 +24,17 @@
 
 package processing.app;
 
-import jssc.*;
-import processing.app.debug.MessageConsumer;
+import static processing.app.I18n._;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-import static processing.app.I18n._;
+import jssc.SerialPort;
+import jssc.SerialPortEvent;
+import jssc.SerialPortEventListener;
+import jssc.SerialPortException;
+import processing.app.debug.MessageConsumer;
 
 
 public class Serial implements SerialPortEventListener {
@@ -172,7 +175,7 @@ public void addListener(MessageConsumer consumer) {
   public synchronized void serialEvent(SerialPortEvent serialEvent) {
     if (serialEvent.isRXCHAR()) {
       try {
-        byte[] buf = port.readBytes();
+        byte[] buf = port.readBytes(serialEvent.getEventValue());
         if (buf.length > 0) {
           if (bufferLast == buffer.length) {
             byte temp[] = new byte[bufferLast << 1];